diff --git a/CHANGELOG.md b/CHANGELOG.md index 043cddddd..95b2c30a0 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor ### v1.11.14 +**v1.11.14.12** *(2015-10-31)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.14.12/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.14.12/builds/4chan-X-noupdate.crx "Chromium version")] +- (Bui, Ayylmao69) Archive list update: Add /his/. + +**v1.11.14.11** *(2015-10-31)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.14.11/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.14.11/builds/4chan-X-noupdate.crx "Chromium version")] +- Match Halloween theme colors for users who haven't blocked it. + +**v1.11.14.10** *(2015-10-31)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.14.10/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.14.10/builds/4chan-X-noupdate.crx "Chromium version")] +- Fix 4chan X UI elements becoming transparent during Halloween theme. + **v1.11.14.9** *(2015-10-30)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.14.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.14.9/builds/4chan-X-noupdate.crx "Chromium version")] - (Bui) New archive: 4ch.be. - Minor bugfixes. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 0f0e3189c..977d76beb 100644 Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js index 9e5b25980..96dcec8fb 100644 --- a/builds/4chan-X-beta.meta.js +++ b/builds/4chan-X-beta.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.11.14.9 +// @version 1.11.14.12 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js index 3b8951339..e7cfd17c7 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X beta -// @version 1.11.14.9 +// @version 1.11.14.12 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -414,7 +414,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.14.9', + VERSION: '1.11.14.12', NAMESPACE: '4chan X.', boards: {} }; @@ -8556,7 +8556,7 @@ return this.conn.target = iframe; }, setupJS: function() { - return $.globalEval('(function() {\n function render() {\n var container = document.querySelector("#qr .captcha-container");\n container.dataset.widgetID = window.grecaptcha.render(container, {\n sitekey: \'6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc\',\n theme: document.documentElement.classList.contains(\'tomorrow\') ? \'dark\' : \'light\',\n callback: function(response) {\n window.dispatchEvent(new CustomEvent("captcha:success", {detail: response}));\n }\n });\n }\n if (window.grecaptcha) {\n render();\n } else {\n var cbNative = window.onRecaptchaLoaded;\n window.onRecaptchaLoaded = function() {\n render();\n cbNative();\n }\n }\n})();'); + return $.globalEval('(function() {\n function render() {\n var container = document.querySelector("#qr .captcha-container");\n container.dataset.widgetID = window.grecaptcha.render(container, {\n sitekey: \'6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc\',\n theme: (document.documentElement.classList.contains(\'tomorrow\') || document.documentElement.classList.contains(\'spooky\')) ? \'dark\' : \'light\',\n callback: function(response) {\n window.dispatchEvent(new CustomEvent("captcha:success", {detail: response}));\n }\n });\n }\n if (window.grecaptcha) {\n render();\n } else {\n var cbNative = window.onRecaptchaLoaded;\n window.onRecaptchaLoaded = function() {\n render();\n cbNative();\n }\n }\n})();'); }, afterSetup: function(mutations) { var iframe, k, len1, len2, mutation, node, q, ref, textarea; @@ -14459,7 +14459,7 @@ } return Redirect.data = o; }, - archives: [{"uid":3,"name":"4plebs","domain":"archive.4plebs.org","http":true,"https":true,"software":"foolfuuka","boards":["adv","f","hr","o","pol","s4s","sp","tg","trv","tv","x"],"files":["adv","f","hr","o","pol","s4s","sp","tg","trv","tv","x"]},{"uid":4,"name":"Nyafuu Archive","domain":"archive.nyafuu.org","http":true,"https":true,"software":"foolfuuka","boards":["c","e","w","wg"],"files":["c","e","w","wg"]},{"uid":5,"name":"Love is Over","domain":"archive.loveisover.me","http":true,"https":true,"software":"foolfuuka","boards":["c","d","e","i","lgbt","t","u"],"files":["c","d","e","i","lgbt","t","u"]},{"uid":8,"name":"Rebecca Black Tech","domain":"rbt.asia","http":false,"https":true,"software":"fuuka","boards":["cgl","g","mu","qa","w"],"files":["cgl","g","mu","qa","w"]},{"uid":10,"name":"warosu","domain":"warosu.org","http":false,"https":true,"software":"fuuka","boards":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"],"files":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"]},{"uid":15,"name":"fgts","domain":"fgts.jp","http":true,"https":true,"software":"foolfuuka","boards":["asp","b","cm","gd","h","hc","hm","n","out","p","po","qa","r","s","soc","toy","vp","y"],"files":["asp","b","cm","gd","h","hc","hm","n","out","p","po","qa","r","s","soc","toy","vp","y"]},{"uid":23,"name":"Desustorage","domain":"desustorage.org","http":true,"https":true,"software":"foolfuuka","boards":["a","aco","an","c","co","d","fit","int","k","m","mlp","qa","r9k","tg","vr","wsg"],"files":["a","aco","an","c","co","d","fit","int","k","m","mlp","qa","r9k","tg","vr","wsg"]},{"uid":24,"name":"fireden.net","domain":"boards.fireden.net","http":false,"https":true,"software":"foolfuuka","boards":["a","cm","ic","sci","tg","v","vg","y"],"files":["a","cm","ic","sci","tg","v","vg","y"]},{"uid":25,"name":"arch.b4k.co","domain":"arch.b4k.co","http":true,"https":true,"software":"foolfuuka","boards":["g","mlp","v"],"files":[]},{"uid":27,"name":"4ch.be","domain":"4ch.be","http":false,"https":true,"software":"foolfuuka","boards":["3","a","aco","adv","an","asp","b","biz","c","cgl","ck","cm","co","d","diy","e","f","fa","fit","g","gd","gif","h","hc","hm","hr","i","ic","int","jp","k","lgbt","lit","m","mlp","mu","n","o","out","p","po","pol","qa","r","r9k","s","s4s","sci","soc","sp","t","tg","toy","trv","tv","u","v","vg","vp","vr","w","wg","wsg","x","y"],"files":[],"search":["a","aco","adv","an","asp","b","biz","c","cgl","ck","cm","co","d","diy","e","f","fa","fit","g","gd","gif","h","hc","hm","hr","i","ic","int","jp","k","lgbt","lit","m","mlp","mu","n","o","out","p","po","pol","qa","r","r9k","s","s4s","sci","soc","sp","t","tg","toy","trv","tv","u","v","vg","vp","vr","w","wg","wsg","x","y"]}], + archives: [{"uid":3,"name":"4plebs","domain":"archive.4plebs.org","http":true,"https":true,"software":"foolfuuka","boards":["adv","f","hr","o","pol","s4s","sp","tg","trv","tv","x"],"files":["adv","f","hr","o","pol","s4s","sp","tg","trv","tv","x"]},{"uid":4,"name":"Nyafuu Archive","domain":"archive.nyafuu.org","http":true,"https":true,"software":"foolfuuka","boards":["c","e","w","wg"],"files":["c","e","w","wg"]},{"uid":5,"name":"Love is Over","domain":"archive.loveisover.me","http":true,"https":true,"software":"foolfuuka","boards":["c","d","e","i","lgbt","t","u"],"files":["c","d","e","i","lgbt","t","u"]},{"uid":8,"name":"Rebecca Black Tech","domain":"rbt.asia","http":false,"https":true,"software":"fuuka","boards":["cgl","g","mu","qa","w"],"files":["cgl","g","mu","qa","w"]},{"uid":10,"name":"warosu","domain":"warosu.org","http":false,"https":true,"software":"fuuka","boards":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"],"files":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"]},{"uid":15,"name":"fgts","domain":"fgts.jp","http":true,"https":true,"software":"foolfuuka","boards":["asp","b","cm","gd","h","hc","hm","n","out","p","po","qa","r","s","soc","toy","vp","y"],"files":["asp","b","cm","gd","h","hc","hm","n","out","p","po","qa","r","s","soc","toy","vp","y"]},{"uid":23,"name":"Desustorage","domain":"desustorage.org","http":true,"https":true,"software":"foolfuuka","boards":["a","aco","an","c","co","d","fit","his","int","k","m","mlp","qa","r9k","tg","vr","wsg"],"files":["a","aco","an","c","co","d","fit","his","int","k","m","mlp","qa","r9k","tg","vr","wsg"]},{"uid":24,"name":"fireden.net","domain":"boards.fireden.net","http":false,"https":true,"software":"foolfuuka","boards":["a","cm","ic","sci","tg","v","vg","y"],"files":["a","cm","ic","sci","tg","v","vg","y"]},{"uid":25,"name":"arch.b4k.co","domain":"arch.b4k.co","http":true,"https":true,"software":"foolfuuka","boards":["g","mlp","v"],"files":[]},{"uid":27,"name":"4ch.be","domain":"4ch.be","http":false,"https":true,"software":"foolfuuka","boards":["3","a","aco","adv","an","asp","b","biz","c","cgl","ck","cm","co","d","diy","e","f","fa","fit","g","gd","gif","h","hc","his","hm","hr","i","ic","int","jp","k","lgbt","lit","m","mlp","mu","n","o","out","p","po","pol","qa","r","r9k","s","s4s","sci","soc","sp","t","tg","toy","trv","tv","u","v","vg","vp","vr","w","wg","wsg","x","y"],"files":[],"search":["a","aco","adv","an","asp","b","biz","c","cgl","ck","cm","co","d","diy","e","f","fa","fit","g","gd","gif","h","hc","his","hm","hr","i","ic","int","jp","k","lgbt","lit","m","mlp","mu","n","o","out","p","po","pol","qa","r","r9k","s","s4s","sci","soc","sp","t","tg","toy","trv","tv","u","v","vg","vp","vr","w","wg","wsg","x","y"]}], to: function(dest, data) { var archive; archive = (dest === 'search' || dest === 'board' ? Redirect.data.thread : Redirect.data[dest])[data.boardID]; @@ -17462,7 +17462,14 @@ return Main.setClass(); }, setClass: function() { - var mainStyleSheet, setStyle, style, styleSheets; + var mainStyleSheet, setStyle, spooky, style, styleSheets; + if ((spooky = $('link[rel="stylesheet"][href^="//s.4cdn.org/css/spooky."]', d.head))) { + spooky.removeAttribute('media'); + if (getComputedStyle(d.body).color === 'rgb(196, 151, 86)') { + $.addClass(doc, 'spooky'); + return; + } + } if (g.VIEW === 'catalog') { $.addClass(doc, $.id('base-css').href.match(/catalog_(\w+)/)[1].replace('_new', '').replace(/_+/g, '-')); return; @@ -17475,7 +17482,7 @@ $.rmClass(doc, style); for (k = 0, len1 = styleSheets.length; k < len1; k++) { styleSheet = styleSheets[k]; - if (styleSheet.href === mainStyleSheet.href) { + if (styleSheet.href === (mainStyleSheet != null ? mainStyleSheet.href : void 0)) { style = styleSheet.title.toLowerCase().replace('new', '').trim().replace(/\s+/g, '-'); break; } @@ -20876,6 +20883,126 @@ ":root.photon div.boardTitle {\n" + " font-family: sans-serif !important;\n" + " text-shadow: 1px 1px 1px rgba(0,74,153,0.6);\n" + +"}\n" + +"/* General */\n" + +":root.spooky .dialog {\n" + +" background-color: #171526;\n" + +" border-color: #707070;\n" + +"}\n" + +":root.spooky .field:focus,\n" + +":root.spooky .field.focus {\n" + +" border-color: #98E;\n" + +"}\n" + +"/* Header */\n" + +":root.spooky #header-bar.dialog {\n" + +" background-color: rgba(23,21,38,0.98);\n" + +"}\n" + +":root.spooky:not(.fixed) #header-bar, :root.spooky #notifications {\n" + +" font-size: 9pt;\n" + +"}\n" + +":root.spooky #header-bar, :root.spooky #notifications {\n" + +" color: #C49756;\n" + +"}\n" + +":root.spooky #board-list a, :root.spooky #shortcuts a {\n" + +" color: #FE9600;\n" + +"}\n" + +":root.spooky.fixed #custom-board-list .current:hover {\n" + +" border-bottom-color: rgba(255,0,0,0.2);\n" + +"}\n" + +"/* Settings */\n" + +":root.spooky #fourchanx-settings fieldset, :root.spooky .section-main div::before {\n" + +" border-color: #707070;\n" + +"}\n" + +":root.spooky .suboption-list > div:last-of-type {\n" + +" background-color: #171526;\n" + +"}\n" + +"/* Quote */\n" + +":root.spooky .catalog-thread > .comment > span.quote, :root.spooky #arc-list span.quote {\n" + +" color: #634C2C;\n" + +"}\n" + +":root.spooky .backlink.deadlink {\n" + +" color: #FE9600 !important;\n" + +"}\n" + +":root.spooky .inline {\n" + +" border-color: #707070;\n" + +" background-color: rgba(255, 255, 255, .14);\n" + +"}\n" + +"/* QR */\n" + +".spooky #dump-list::-webkit-scrollbar-thumb {\n" + +" background-color: #171526;\n" + +" border-color: #707070;\n" + +"}\n" + +":root.spooky .qr-preview {\n" + +" background-color: rgba(0, 0, 0, .15);\n" + +"}\n" + +":root.spooky #qr .field {\n" + +" background-color: rgb(26, 27, 29);\n" + +" color: rgb(197,200,198);\n" + +" border-color: rgb(40, 41, 42);\n" + +"}\n" + +":root.spooky #qr .field:focus,\n" + +":root.spooky #qr .field.focus {\n" + +" border-color: rgb(254, 150, 0) !important;\n" + +" background-color: rgb(30,32,36);\n" + +"}\n" + +":root.spooky .persona button {\n" + +" background: linear-gradient(to bottom, #2E3035, #222427) no-repeat;\n" + +" color: rgb(197,200,198);\n" + +" border-color: rgb(40, 41, 42);\n" + +" outline: none;\n" + +"}\n" + +":root.spooky .persona button::-moz-focus-inner {\n" + +" border: none;\n" + +"}\n" + +":root.spooky .persona button:focus {\n" + +" border-color: rgb(254, 150, 0);\n" + +"}\n" + +":root.spooky #qr.sjis-preview #sjis-toggle,\n" + +":root.spooky #qr.tex-preview #tex-preview-button {\n" + +" background: rgb(26, 27, 29);\n" + +"}\n" + +":root.spooky #qr select,\n" + +":root.spooky #file-n-submit > input,\n" + +":root.spooky #qr-draw-button {\n" + +" border-color: rgb(40, 41, 42);\n" + +"}\n" + +":root.spooky #qr-filename {\n" + +" color: rgb(197,200,198);\n" + +"}\n" + +":root.spooky .qr-link {\n" + +" border-color: rgb(8, 6, 23) rgb(8, 6, 23) rgb(0, 0, 8);\n" + +" background: linear-gradient(#262435, #171526) repeat scroll 0% 0% transparent;\n" + +"}\n" + +":root.spooky .qr-link:hover {\n" + +" background: #1A1829;\n" + +"}\n" + +"/* Menu */\n" + +":root.spooky #menu {\n" + +" color: #FE9600;\n" + +"}\n" + +":root.spooky .entry {\n" + +" font-size: 10pt;\n" + +"}\n" + +":root.spooky .focused.entry {\n" + +" background: rgba(255, 255, 255, .33);\n" + +"}\n" + +"/* Unread */\n" + +":root.spooky #unread-line {\n" + +" border-color: rgb(197, 200, 198);\n" + +"}\n" + +"/* Thread Watcher */\n" + +":root.spooky .replies-quoting-you > a, :root.spooky #watcher-link.disabled.replies-quoting-you {\n" + +" color: #F00 !important;\n" + +"}\n" + +"/* Watcher Favicon */\n" + +":root.spooky .watch-thread-link\n" + +"{\n" + +" background-image: url(\"data:image/svg+xml,\");\n" + +"}\n" + +"/* Board Title */\n" + +":root.spooky div.boardTitle {\n" + +" font-family: sans-serif !important;\n" + +" text-shadow: 1px 1px 1px rgba(105,10,15,0.6);\n" + "}", cssWWW: "#captcha-cnt {\n" + " height: auto;\n" + diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 62fc2e798..76bdcf5e9 100644 Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js index 8b7e28b21..885c48348 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.11.14.9 +// @version 1.11.14.12 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -414,7 +414,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.14.9', + VERSION: '1.11.14.12', NAMESPACE: '4chan X.', boards: {} }; @@ -8556,7 +8556,7 @@ return this.conn.target = iframe; }, setupJS: function() { - return $.globalEval('(function() {\n function render() {\n var container = document.querySelector("#qr .captcha-container");\n container.dataset.widgetID = window.grecaptcha.render(container, {\n sitekey: \'6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc\',\n theme: document.documentElement.classList.contains(\'tomorrow\') ? \'dark\' : \'light\',\n callback: function(response) {\n window.dispatchEvent(new CustomEvent("captcha:success", {detail: response}));\n }\n });\n }\n if (window.grecaptcha) {\n render();\n } else {\n var cbNative = window.onRecaptchaLoaded;\n window.onRecaptchaLoaded = function() {\n render();\n cbNative();\n }\n }\n})();'); + return $.globalEval('(function() {\n function render() {\n var container = document.querySelector("#qr .captcha-container");\n container.dataset.widgetID = window.grecaptcha.render(container, {\n sitekey: \'6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc\',\n theme: (document.documentElement.classList.contains(\'tomorrow\') || document.documentElement.classList.contains(\'spooky\')) ? \'dark\' : \'light\',\n callback: function(response) {\n window.dispatchEvent(new CustomEvent("captcha:success", {detail: response}));\n }\n });\n }\n if (window.grecaptcha) {\n render();\n } else {\n var cbNative = window.onRecaptchaLoaded;\n window.onRecaptchaLoaded = function() {\n render();\n cbNative();\n }\n }\n})();'); }, afterSetup: function(mutations) { var iframe, k, len1, len2, mutation, node, q, ref, textarea; @@ -14459,7 +14459,7 @@ } return Redirect.data = o; }, - archives: [{"uid":3,"name":"4plebs","domain":"archive.4plebs.org","http":true,"https":true,"software":"foolfuuka","boards":["adv","f","hr","o","pol","s4s","sp","tg","trv","tv","x"],"files":["adv","f","hr","o","pol","s4s","sp","tg","trv","tv","x"]},{"uid":4,"name":"Nyafuu Archive","domain":"archive.nyafuu.org","http":true,"https":true,"software":"foolfuuka","boards":["c","e","w","wg"],"files":["c","e","w","wg"]},{"uid":5,"name":"Love is Over","domain":"archive.loveisover.me","http":true,"https":true,"software":"foolfuuka","boards":["c","d","e","i","lgbt","t","u"],"files":["c","d","e","i","lgbt","t","u"]},{"uid":8,"name":"Rebecca Black Tech","domain":"rbt.asia","http":false,"https":true,"software":"fuuka","boards":["cgl","g","mu","qa","w"],"files":["cgl","g","mu","qa","w"]},{"uid":10,"name":"warosu","domain":"warosu.org","http":false,"https":true,"software":"fuuka","boards":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"],"files":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"]},{"uid":15,"name":"fgts","domain":"fgts.jp","http":true,"https":true,"software":"foolfuuka","boards":["asp","b","cm","gd","h","hc","hm","n","out","p","po","qa","r","s","soc","toy","vp","y"],"files":["asp","b","cm","gd","h","hc","hm","n","out","p","po","qa","r","s","soc","toy","vp","y"]},{"uid":23,"name":"Desustorage","domain":"desustorage.org","http":true,"https":true,"software":"foolfuuka","boards":["a","aco","an","c","co","d","fit","int","k","m","mlp","qa","r9k","tg","vr","wsg"],"files":["a","aco","an","c","co","d","fit","int","k","m","mlp","qa","r9k","tg","vr","wsg"]},{"uid":24,"name":"fireden.net","domain":"boards.fireden.net","http":false,"https":true,"software":"foolfuuka","boards":["a","cm","ic","sci","tg","v","vg","y"],"files":["a","cm","ic","sci","tg","v","vg","y"]},{"uid":25,"name":"arch.b4k.co","domain":"arch.b4k.co","http":true,"https":true,"software":"foolfuuka","boards":["g","mlp","v"],"files":[]},{"uid":27,"name":"4ch.be","domain":"4ch.be","http":false,"https":true,"software":"foolfuuka","boards":["3","a","aco","adv","an","asp","b","biz","c","cgl","ck","cm","co","d","diy","e","f","fa","fit","g","gd","gif","h","hc","hm","hr","i","ic","int","jp","k","lgbt","lit","m","mlp","mu","n","o","out","p","po","pol","qa","r","r9k","s","s4s","sci","soc","sp","t","tg","toy","trv","tv","u","v","vg","vp","vr","w","wg","wsg","x","y"],"files":[],"search":["a","aco","adv","an","asp","b","biz","c","cgl","ck","cm","co","d","diy","e","f","fa","fit","g","gd","gif","h","hc","hm","hr","i","ic","int","jp","k","lgbt","lit","m","mlp","mu","n","o","out","p","po","pol","qa","r","r9k","s","s4s","sci","soc","sp","t","tg","toy","trv","tv","u","v","vg","vp","vr","w","wg","wsg","x","y"]}], + archives: [{"uid":3,"name":"4plebs","domain":"archive.4plebs.org","http":true,"https":true,"software":"foolfuuka","boards":["adv","f","hr","o","pol","s4s","sp","tg","trv","tv","x"],"files":["adv","f","hr","o","pol","s4s","sp","tg","trv","tv","x"]},{"uid":4,"name":"Nyafuu Archive","domain":"archive.nyafuu.org","http":true,"https":true,"software":"foolfuuka","boards":["c","e","w","wg"],"files":["c","e","w","wg"]},{"uid":5,"name":"Love is Over","domain":"archive.loveisover.me","http":true,"https":true,"software":"foolfuuka","boards":["c","d","e","i","lgbt","t","u"],"files":["c","d","e","i","lgbt","t","u"]},{"uid":8,"name":"Rebecca Black Tech","domain":"rbt.asia","http":false,"https":true,"software":"fuuka","boards":["cgl","g","mu","qa","w"],"files":["cgl","g","mu","qa","w"]},{"uid":10,"name":"warosu","domain":"warosu.org","http":false,"https":true,"software":"fuuka","boards":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"],"files":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"]},{"uid":15,"name":"fgts","domain":"fgts.jp","http":true,"https":true,"software":"foolfuuka","boards":["asp","b","cm","gd","h","hc","hm","n","out","p","po","qa","r","s","soc","toy","vp","y"],"files":["asp","b","cm","gd","h","hc","hm","n","out","p","po","qa","r","s","soc","toy","vp","y"]},{"uid":23,"name":"Desustorage","domain":"desustorage.org","http":true,"https":true,"software":"foolfuuka","boards":["a","aco","an","c","co","d","fit","his","int","k","m","mlp","qa","r9k","tg","vr","wsg"],"files":["a","aco","an","c","co","d","fit","his","int","k","m","mlp","qa","r9k","tg","vr","wsg"]},{"uid":24,"name":"fireden.net","domain":"boards.fireden.net","http":false,"https":true,"software":"foolfuuka","boards":["a","cm","ic","sci","tg","v","vg","y"],"files":["a","cm","ic","sci","tg","v","vg","y"]},{"uid":25,"name":"arch.b4k.co","domain":"arch.b4k.co","http":true,"https":true,"software":"foolfuuka","boards":["g","mlp","v"],"files":[]},{"uid":27,"name":"4ch.be","domain":"4ch.be","http":false,"https":true,"software":"foolfuuka","boards":["3","a","aco","adv","an","asp","b","biz","c","cgl","ck","cm","co","d","diy","e","f","fa","fit","g","gd","gif","h","hc","his","hm","hr","i","ic","int","jp","k","lgbt","lit","m","mlp","mu","n","o","out","p","po","pol","qa","r","r9k","s","s4s","sci","soc","sp","t","tg","toy","trv","tv","u","v","vg","vp","vr","w","wg","wsg","x","y"],"files":[],"search":["a","aco","adv","an","asp","b","biz","c","cgl","ck","cm","co","d","diy","e","f","fa","fit","g","gd","gif","h","hc","his","hm","hr","i","ic","int","jp","k","lgbt","lit","m","mlp","mu","n","o","out","p","po","pol","qa","r","r9k","s","s4s","sci","soc","sp","t","tg","toy","trv","tv","u","v","vg","vp","vr","w","wg","wsg","x","y"]}], to: function(dest, data) { var archive; archive = (dest === 'search' || dest === 'board' ? Redirect.data.thread : Redirect.data[dest])[data.boardID]; @@ -17462,7 +17462,14 @@ return Main.setClass(); }, setClass: function() { - var mainStyleSheet, setStyle, style, styleSheets; + var mainStyleSheet, setStyle, spooky, style, styleSheets; + if ((spooky = $('link[rel="stylesheet"][href^="//s.4cdn.org/css/spooky."]', d.head))) { + spooky.removeAttribute('media'); + if (getComputedStyle(d.body).color === 'rgb(196, 151, 86)') { + $.addClass(doc, 'spooky'); + return; + } + } if (g.VIEW === 'catalog') { $.addClass(doc, $.id('base-css').href.match(/catalog_(\w+)/)[1].replace('_new', '').replace(/_+/g, '-')); return; @@ -17475,7 +17482,7 @@ $.rmClass(doc, style); for (k = 0, len1 = styleSheets.length; k < len1; k++) { styleSheet = styleSheets[k]; - if (styleSheet.href === mainStyleSheet.href) { + if (styleSheet.href === (mainStyleSheet != null ? mainStyleSheet.href : void 0)) { style = styleSheet.title.toLowerCase().replace('new', '').trim().replace(/\s+/g, '-'); break; } @@ -20876,6 +20883,126 @@ ":root.photon div.boardTitle {\n" + " font-family: sans-serif !important;\n" + " text-shadow: 1px 1px 1px rgba(0,74,153,0.6);\n" + +"}\n" + +"/* General */\n" + +":root.spooky .dialog {\n" + +" background-color: #171526;\n" + +" border-color: #707070;\n" + +"}\n" + +":root.spooky .field:focus,\n" + +":root.spooky .field.focus {\n" + +" border-color: #98E;\n" + +"}\n" + +"/* Header */\n" + +":root.spooky #header-bar.dialog {\n" + +" background-color: rgba(23,21,38,0.98);\n" + +"}\n" + +":root.spooky:not(.fixed) #header-bar, :root.spooky #notifications {\n" + +" font-size: 9pt;\n" + +"}\n" + +":root.spooky #header-bar, :root.spooky #notifications {\n" + +" color: #C49756;\n" + +"}\n" + +":root.spooky #board-list a, :root.spooky #shortcuts a {\n" + +" color: #FE9600;\n" + +"}\n" + +":root.spooky.fixed #custom-board-list .current:hover {\n" + +" border-bottom-color: rgba(255,0,0,0.2);\n" + +"}\n" + +"/* Settings */\n" + +":root.spooky #fourchanx-settings fieldset, :root.spooky .section-main div::before {\n" + +" border-color: #707070;\n" + +"}\n" + +":root.spooky .suboption-list > div:last-of-type {\n" + +" background-color: #171526;\n" + +"}\n" + +"/* Quote */\n" + +":root.spooky .catalog-thread > .comment > span.quote, :root.spooky #arc-list span.quote {\n" + +" color: #634C2C;\n" + +"}\n" + +":root.spooky .backlink.deadlink {\n" + +" color: #FE9600 !important;\n" + +"}\n" + +":root.spooky .inline {\n" + +" border-color: #707070;\n" + +" background-color: rgba(255, 255, 255, .14);\n" + +"}\n" + +"/* QR */\n" + +".spooky #dump-list::-webkit-scrollbar-thumb {\n" + +" background-color: #171526;\n" + +" border-color: #707070;\n" + +"}\n" + +":root.spooky .qr-preview {\n" + +" background-color: rgba(0, 0, 0, .15);\n" + +"}\n" + +":root.spooky #qr .field {\n" + +" background-color: rgb(26, 27, 29);\n" + +" color: rgb(197,200,198);\n" + +" border-color: rgb(40, 41, 42);\n" + +"}\n" + +":root.spooky #qr .field:focus,\n" + +":root.spooky #qr .field.focus {\n" + +" border-color: rgb(254, 150, 0) !important;\n" + +" background-color: rgb(30,32,36);\n" + +"}\n" + +":root.spooky .persona button {\n" + +" background: linear-gradient(to bottom, #2E3035, #222427) no-repeat;\n" + +" color: rgb(197,200,198);\n" + +" border-color: rgb(40, 41, 42);\n" + +" outline: none;\n" + +"}\n" + +":root.spooky .persona button::-moz-focus-inner {\n" + +" border: none;\n" + +"}\n" + +":root.spooky .persona button:focus {\n" + +" border-color: rgb(254, 150, 0);\n" + +"}\n" + +":root.spooky #qr.sjis-preview #sjis-toggle,\n" + +":root.spooky #qr.tex-preview #tex-preview-button {\n" + +" background: rgb(26, 27, 29);\n" + +"}\n" + +":root.spooky #qr select,\n" + +":root.spooky #file-n-submit > input,\n" + +":root.spooky #qr-draw-button {\n" + +" border-color: rgb(40, 41, 42);\n" + +"}\n" + +":root.spooky #qr-filename {\n" + +" color: rgb(197,200,198);\n" + +"}\n" + +":root.spooky .qr-link {\n" + +" border-color: rgb(8, 6, 23) rgb(8, 6, 23) rgb(0, 0, 8);\n" + +" background: linear-gradient(#262435, #171526) repeat scroll 0% 0% transparent;\n" + +"}\n" + +":root.spooky .qr-link:hover {\n" + +" background: #1A1829;\n" + +"}\n" + +"/* Menu */\n" + +":root.spooky #menu {\n" + +" color: #FE9600;\n" + +"}\n" + +":root.spooky .entry {\n" + +" font-size: 10pt;\n" + +"}\n" + +":root.spooky .focused.entry {\n" + +" background: rgba(255, 255, 255, .33);\n" + +"}\n" + +"/* Unread */\n" + +":root.spooky #unread-line {\n" + +" border-color: rgb(197, 200, 198);\n" + +"}\n" + +"/* Thread Watcher */\n" + +":root.spooky .replies-quoting-you > a, :root.spooky #watcher-link.disabled.replies-quoting-you {\n" + +" color: #F00 !important;\n" + +"}\n" + +"/* Watcher Favicon */\n" + +":root.spooky .watch-thread-link\n" + +"{\n" + +" background-image: url(\"data:image/svg+xml,\");\n" + +"}\n" + +"/* Board Title */\n" + +":root.spooky div.boardTitle {\n" + +" font-family: sans-serif !important;\n" + +" text-shadow: 1px 1px 1px rgba(105,10,15,0.6);\n" + "}", cssWWW: "#captcha-cnt {\n" + " height: auto;\n" + diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 357635477..850ee7406 100644 Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index 4ea933974..6f1522789 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.11.14.9 +// @version 1.11.14.12 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index b3367c19f..f0e632702 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.11.14.9 +// @version 1.11.14.12 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -414,7 +414,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.14.9', + VERSION: '1.11.14.12', NAMESPACE: '4chan X.', boards: {} }; @@ -8556,7 +8556,7 @@ return this.conn.target = iframe; }, setupJS: function() { - return $.globalEval('(function() {\n function render() {\n var container = document.querySelector("#qr .captcha-container");\n container.dataset.widgetID = window.grecaptcha.render(container, {\n sitekey: \'6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc\',\n theme: document.documentElement.classList.contains(\'tomorrow\') ? \'dark\' : \'light\',\n callback: function(response) {\n window.dispatchEvent(new CustomEvent("captcha:success", {detail: response}));\n }\n });\n }\n if (window.grecaptcha) {\n render();\n } else {\n var cbNative = window.onRecaptchaLoaded;\n window.onRecaptchaLoaded = function() {\n render();\n cbNative();\n }\n }\n})();'); + return $.globalEval('(function() {\n function render() {\n var container = document.querySelector("#qr .captcha-container");\n container.dataset.widgetID = window.grecaptcha.render(container, {\n sitekey: \'6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc\',\n theme: (document.documentElement.classList.contains(\'tomorrow\') || document.documentElement.classList.contains(\'spooky\')) ? \'dark\' : \'light\',\n callback: function(response) {\n window.dispatchEvent(new CustomEvent("captcha:success", {detail: response}));\n }\n });\n }\n if (window.grecaptcha) {\n render();\n } else {\n var cbNative = window.onRecaptchaLoaded;\n window.onRecaptchaLoaded = function() {\n render();\n cbNative();\n }\n }\n})();'); }, afterSetup: function(mutations) { var iframe, k, len1, len2, mutation, node, q, ref, textarea; @@ -14459,7 +14459,7 @@ } return Redirect.data = o; }, - archives: [{"uid":3,"name":"4plebs","domain":"archive.4plebs.org","http":true,"https":true,"software":"foolfuuka","boards":["adv","f","hr","o","pol","s4s","sp","tg","trv","tv","x"],"files":["adv","f","hr","o","pol","s4s","sp","tg","trv","tv","x"]},{"uid":4,"name":"Nyafuu Archive","domain":"archive.nyafuu.org","http":true,"https":true,"software":"foolfuuka","boards":["c","e","w","wg"],"files":["c","e","w","wg"]},{"uid":5,"name":"Love is Over","domain":"archive.loveisover.me","http":true,"https":true,"software":"foolfuuka","boards":["c","d","e","i","lgbt","t","u"],"files":["c","d","e","i","lgbt","t","u"]},{"uid":8,"name":"Rebecca Black Tech","domain":"rbt.asia","http":false,"https":true,"software":"fuuka","boards":["cgl","g","mu","qa","w"],"files":["cgl","g","mu","qa","w"]},{"uid":10,"name":"warosu","domain":"warosu.org","http":false,"https":true,"software":"fuuka","boards":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"],"files":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"]},{"uid":15,"name":"fgts","domain":"fgts.jp","http":true,"https":true,"software":"foolfuuka","boards":["asp","b","cm","gd","h","hc","hm","n","out","p","po","qa","r","s","soc","toy","vp","y"],"files":["asp","b","cm","gd","h","hc","hm","n","out","p","po","qa","r","s","soc","toy","vp","y"]},{"uid":23,"name":"Desustorage","domain":"desustorage.org","http":true,"https":true,"software":"foolfuuka","boards":["a","aco","an","c","co","d","fit","int","k","m","mlp","qa","r9k","tg","vr","wsg"],"files":["a","aco","an","c","co","d","fit","int","k","m","mlp","qa","r9k","tg","vr","wsg"]},{"uid":24,"name":"fireden.net","domain":"boards.fireden.net","http":false,"https":true,"software":"foolfuuka","boards":["a","cm","ic","sci","tg","v","vg","y"],"files":["a","cm","ic","sci","tg","v","vg","y"]},{"uid":25,"name":"arch.b4k.co","domain":"arch.b4k.co","http":true,"https":true,"software":"foolfuuka","boards":["g","mlp","v"],"files":[]},{"uid":27,"name":"4ch.be","domain":"4ch.be","http":false,"https":true,"software":"foolfuuka","boards":["3","a","aco","adv","an","asp","b","biz","c","cgl","ck","cm","co","d","diy","e","f","fa","fit","g","gd","gif","h","hc","hm","hr","i","ic","int","jp","k","lgbt","lit","m","mlp","mu","n","o","out","p","po","pol","qa","r","r9k","s","s4s","sci","soc","sp","t","tg","toy","trv","tv","u","v","vg","vp","vr","w","wg","wsg","x","y"],"files":[],"search":["a","aco","adv","an","asp","b","biz","c","cgl","ck","cm","co","d","diy","e","f","fa","fit","g","gd","gif","h","hc","hm","hr","i","ic","int","jp","k","lgbt","lit","m","mlp","mu","n","o","out","p","po","pol","qa","r","r9k","s","s4s","sci","soc","sp","t","tg","toy","trv","tv","u","v","vg","vp","vr","w","wg","wsg","x","y"]}], + archives: [{"uid":3,"name":"4plebs","domain":"archive.4plebs.org","http":true,"https":true,"software":"foolfuuka","boards":["adv","f","hr","o","pol","s4s","sp","tg","trv","tv","x"],"files":["adv","f","hr","o","pol","s4s","sp","tg","trv","tv","x"]},{"uid":4,"name":"Nyafuu Archive","domain":"archive.nyafuu.org","http":true,"https":true,"software":"foolfuuka","boards":["c","e","w","wg"],"files":["c","e","w","wg"]},{"uid":5,"name":"Love is Over","domain":"archive.loveisover.me","http":true,"https":true,"software":"foolfuuka","boards":["c","d","e","i","lgbt","t","u"],"files":["c","d","e","i","lgbt","t","u"]},{"uid":8,"name":"Rebecca Black Tech","domain":"rbt.asia","http":false,"https":true,"software":"fuuka","boards":["cgl","g","mu","qa","w"],"files":["cgl","g","mu","qa","w"]},{"uid":10,"name":"warosu","domain":"warosu.org","http":false,"https":true,"software":"fuuka","boards":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"],"files":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"]},{"uid":15,"name":"fgts","domain":"fgts.jp","http":true,"https":true,"software":"foolfuuka","boards":["asp","b","cm","gd","h","hc","hm","n","out","p","po","qa","r","s","soc","toy","vp","y"],"files":["asp","b","cm","gd","h","hc","hm","n","out","p","po","qa","r","s","soc","toy","vp","y"]},{"uid":23,"name":"Desustorage","domain":"desustorage.org","http":true,"https":true,"software":"foolfuuka","boards":["a","aco","an","c","co","d","fit","his","int","k","m","mlp","qa","r9k","tg","vr","wsg"],"files":["a","aco","an","c","co","d","fit","his","int","k","m","mlp","qa","r9k","tg","vr","wsg"]},{"uid":24,"name":"fireden.net","domain":"boards.fireden.net","http":false,"https":true,"software":"foolfuuka","boards":["a","cm","ic","sci","tg","v","vg","y"],"files":["a","cm","ic","sci","tg","v","vg","y"]},{"uid":25,"name":"arch.b4k.co","domain":"arch.b4k.co","http":true,"https":true,"software":"foolfuuka","boards":["g","mlp","v"],"files":[]},{"uid":27,"name":"4ch.be","domain":"4ch.be","http":false,"https":true,"software":"foolfuuka","boards":["3","a","aco","adv","an","asp","b","biz","c","cgl","ck","cm","co","d","diy","e","f","fa","fit","g","gd","gif","h","hc","his","hm","hr","i","ic","int","jp","k","lgbt","lit","m","mlp","mu","n","o","out","p","po","pol","qa","r","r9k","s","s4s","sci","soc","sp","t","tg","toy","trv","tv","u","v","vg","vp","vr","w","wg","wsg","x","y"],"files":[],"search":["a","aco","adv","an","asp","b","biz","c","cgl","ck","cm","co","d","diy","e","f","fa","fit","g","gd","gif","h","hc","his","hm","hr","i","ic","int","jp","k","lgbt","lit","m","mlp","mu","n","o","out","p","po","pol","qa","r","r9k","s","s4s","sci","soc","sp","t","tg","toy","trv","tv","u","v","vg","vp","vr","w","wg","wsg","x","y"]}], to: function(dest, data) { var archive; archive = (dest === 'search' || dest === 'board' ? Redirect.data.thread : Redirect.data[dest])[data.boardID]; @@ -17462,7 +17462,14 @@ return Main.setClass(); }, setClass: function() { - var mainStyleSheet, setStyle, style, styleSheets; + var mainStyleSheet, setStyle, spooky, style, styleSheets; + if ((spooky = $('link[rel="stylesheet"][href^="//s.4cdn.org/css/spooky."]', d.head))) { + spooky.removeAttribute('media'); + if (getComputedStyle(d.body).color === 'rgb(196, 151, 86)') { + $.addClass(doc, 'spooky'); + return; + } + } if (g.VIEW === 'catalog') { $.addClass(doc, $.id('base-css').href.match(/catalog_(\w+)/)[1].replace('_new', '').replace(/_+/g, '-')); return; @@ -17475,7 +17482,7 @@ $.rmClass(doc, style); for (k = 0, len1 = styleSheets.length; k < len1; k++) { styleSheet = styleSheets[k]; - if (styleSheet.href === mainStyleSheet.href) { + if (styleSheet.href === (mainStyleSheet != null ? mainStyleSheet.href : void 0)) { style = styleSheet.title.toLowerCase().replace('new', '').trim().replace(/\s+/g, '-'); break; } @@ -20876,6 +20883,126 @@ ":root.photon div.boardTitle {\n" + " font-family: sans-serif !important;\n" + " text-shadow: 1px 1px 1px rgba(0,74,153,0.6);\n" + +"}\n" + +"/* General */\n" + +":root.spooky .dialog {\n" + +" background-color: #171526;\n" + +" border-color: #707070;\n" + +"}\n" + +":root.spooky .field:focus,\n" + +":root.spooky .field.focus {\n" + +" border-color: #98E;\n" + +"}\n" + +"/* Header */\n" + +":root.spooky #header-bar.dialog {\n" + +" background-color: rgba(23,21,38,0.98);\n" + +"}\n" + +":root.spooky:not(.fixed) #header-bar, :root.spooky #notifications {\n" + +" font-size: 9pt;\n" + +"}\n" + +":root.spooky #header-bar, :root.spooky #notifications {\n" + +" color: #C49756;\n" + +"}\n" + +":root.spooky #board-list a, :root.spooky #shortcuts a {\n" + +" color: #FE9600;\n" + +"}\n" + +":root.spooky.fixed #custom-board-list .current:hover {\n" + +" border-bottom-color: rgba(255,0,0,0.2);\n" + +"}\n" + +"/* Settings */\n" + +":root.spooky #fourchanx-settings fieldset, :root.spooky .section-main div::before {\n" + +" border-color: #707070;\n" + +"}\n" + +":root.spooky .suboption-list > div:last-of-type {\n" + +" background-color: #171526;\n" + +"}\n" + +"/* Quote */\n" + +":root.spooky .catalog-thread > .comment > span.quote, :root.spooky #arc-list span.quote {\n" + +" color: #634C2C;\n" + +"}\n" + +":root.spooky .backlink.deadlink {\n" + +" color: #FE9600 !important;\n" + +"}\n" + +":root.spooky .inline {\n" + +" border-color: #707070;\n" + +" background-color: rgba(255, 255, 255, .14);\n" + +"}\n" + +"/* QR */\n" + +".spooky #dump-list::-webkit-scrollbar-thumb {\n" + +" background-color: #171526;\n" + +" border-color: #707070;\n" + +"}\n" + +":root.spooky .qr-preview {\n" + +" background-color: rgba(0, 0, 0, .15);\n" + +"}\n" + +":root.spooky #qr .field {\n" + +" background-color: rgb(26, 27, 29);\n" + +" color: rgb(197,200,198);\n" + +" border-color: rgb(40, 41, 42);\n" + +"}\n" + +":root.spooky #qr .field:focus,\n" + +":root.spooky #qr .field.focus {\n" + +" border-color: rgb(254, 150, 0) !important;\n" + +" background-color: rgb(30,32,36);\n" + +"}\n" + +":root.spooky .persona button {\n" + +" background: linear-gradient(to bottom, #2E3035, #222427) no-repeat;\n" + +" color: rgb(197,200,198);\n" + +" border-color: rgb(40, 41, 42);\n" + +" outline: none;\n" + +"}\n" + +":root.spooky .persona button::-moz-focus-inner {\n" + +" border: none;\n" + +"}\n" + +":root.spooky .persona button:focus {\n" + +" border-color: rgb(254, 150, 0);\n" + +"}\n" + +":root.spooky #qr.sjis-preview #sjis-toggle,\n" + +":root.spooky #qr.tex-preview #tex-preview-button {\n" + +" background: rgb(26, 27, 29);\n" + +"}\n" + +":root.spooky #qr select,\n" + +":root.spooky #file-n-submit > input,\n" + +":root.spooky #qr-draw-button {\n" + +" border-color: rgb(40, 41, 42);\n" + +"}\n" + +":root.spooky #qr-filename {\n" + +" color: rgb(197,200,198);\n" + +"}\n" + +":root.spooky .qr-link {\n" + +" border-color: rgb(8, 6, 23) rgb(8, 6, 23) rgb(0, 0, 8);\n" + +" background: linear-gradient(#262435, #171526) repeat scroll 0% 0% transparent;\n" + +"}\n" + +":root.spooky .qr-link:hover {\n" + +" background: #1A1829;\n" + +"}\n" + +"/* Menu */\n" + +":root.spooky #menu {\n" + +" color: #FE9600;\n" + +"}\n" + +":root.spooky .entry {\n" + +" font-size: 10pt;\n" + +"}\n" + +":root.spooky .focused.entry {\n" + +" background: rgba(255, 255, 255, .33);\n" + +"}\n" + +"/* Unread */\n" + +":root.spooky #unread-line {\n" + +" border-color: rgb(197, 200, 198);\n" + +"}\n" + +"/* Thread Watcher */\n" + +":root.spooky .replies-quoting-you > a, :root.spooky #watcher-link.disabled.replies-quoting-you {\n" + +" color: #F00 !important;\n" + +"}\n" + +"/* Watcher Favicon */\n" + +":root.spooky .watch-thread-link\n" + +"{\n" + +" background-image: url(\"data:image/svg+xml,\");\n" + +"}\n" + +"/* Board Title */\n" + +":root.spooky div.boardTitle {\n" + +" font-family: sans-serif !important;\n" + +" text-shadow: 1px 1px 1px rgba(105,10,15,0.6);\n" + "}", cssWWW: "#captcha-cnt {\n" + " height: auto;\n" + diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 1e61e972c..aaf43a033 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml index c9693c99f..305e0da35 100644 --- a/builds/updates-beta.xml +++ b/builds/updates-beta.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/updates.xml b/builds/updates.xml index 8b717a1f6..9be907400 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index b395c1c78..34e816b5b 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "meta": { "name": "4chan X", "fork": "ccd0", - "version": "1.11.14.9", - "date": "2015-10-30T22:55:02.228Z", + "version": "1.11.14.12", + "date": "2015-11-01T00:02:41.314Z", "page": "https://www.4chan-x.net/", "downloads": "https://www.4chan-x.net/builds/", "oldVersions": "https://raw.githubusercontent.com/ccd0/4chan-x/", diff --git a/src/Archive/archives.json b/src/Archive/archives.json index e80a609a6..f5efde6eb 100644 --- a/src/Archive/archives.json +++ b/src/Archive/archives.json @@ -59,8 +59,8 @@ "http": true, "https": true, "software": "foolfuuka", - "boards": ["a", "aco", "an", "c", "co", "d", "fit", "int", "k", "m", "mlp", "qa", "r9k", "tg", "vr", "wsg"], - "files": ["a", "aco", "an", "c", "co", "d", "fit", "int", "k", "m", "mlp", "qa", "r9k", "tg", "vr", "wsg"] + "boards": ["a", "aco", "an", "c", "co", "d", "fit", "his", "int", "k", "m", "mlp", "qa", "r9k", "tg", "vr", "wsg"], + "files": ["a", "aco", "an", "c", "co", "d", "fit", "his", "int", "k", "m", "mlp", "qa", "r9k", "tg", "vr", "wsg"] }, { "uid": 24, "name": "fireden.net", @@ -86,7 +86,7 @@ "http": false, "https": true, "software": "foolfuuka", - "boards": ["3", "a", "aco", "adv", "an", "asp", "b", "biz", "c", "cgl", "ck", "cm", "co", "d", "diy", "e", "f", "fa", "fit", "g", "gd", "gif", "h", "hc", "hm", "hr", "i", "ic", "int", "jp", "k", "lgbt", "lit", "m", "mlp", "mu", "n", "o", "out", "p", "po", "pol", "qa", "r", "r9k", "s", "s4s", "sci", "soc", "sp", "t", "tg", "toy", "trv", "tv", "u", "v", "vg", "vp", "vr", "w", "wg", "wsg", "x", "y"], + "boards": ["3", "a", "aco", "adv", "an", "asp", "b", "biz", "c", "cgl", "ck", "cm", "co", "d", "diy", "e", "f", "fa", "fit", "g", "gd", "gif", "h", "hc", "his", "hm", "hr", "i", "ic", "int", "jp", "k", "lgbt", "lit", "m", "mlp", "mu", "n", "o", "out", "p", "po", "pol", "qa", "r", "r9k", "s", "s4s", "sci", "soc", "sp", "t", "tg", "toy", "trv", "tv", "u", "v", "vg", "vp", "vr", "w", "wg", "wsg", "x", "y"], "files": [], - "search": ["a", "aco", "adv", "an", "asp", "b", "biz", "c", "cgl", "ck", "cm", "co", "d", "diy", "e", "f", "fa", "fit", "g", "gd", "gif", "h", "hc", "hm", "hr", "i", "ic", "int", "jp", "k", "lgbt", "lit", "m", "mlp", "mu", "n", "o", "out", "p", "po", "pol", "qa", "r", "r9k", "s", "s4s", "sci", "soc", "sp", "t", "tg", "toy", "trv", "tv", "u", "v", "vg", "vp", "vr", "w", "wg", "wsg", "x", "y"] + "search": ["a", "aco", "adv", "an", "asp", "b", "biz", "c", "cgl", "ck", "cm", "co", "d", "diy", "e", "f", "fa", "fit", "g", "gd", "gif", "h", "hc", "his", "hm", "hr", "i", "ic", "int", "jp", "k", "lgbt", "lit", "m", "mlp", "mu", "n", "o", "out", "p", "po", "pol", "qa", "r", "r9k", "s", "s4s", "sci", "soc", "sp", "t", "tg", "toy", "trv", "tv", "u", "v", "vg", "vp", "vr", "w", "wg", "wsg", "x", "y"] }] diff --git a/src/General/Main.coffee b/src/General/Main.coffee index 9af731eca..dbf18d700 100755 --- a/src/General/Main.coffee +++ b/src/General/Main.coffee @@ -180,6 +180,12 @@ Main = Main.setClass() setClass: -> + if (spooky = $ 'link[rel="stylesheet"][href^="//s.4cdn.org/css/spooky."]', d.head) + spooky.removeAttribute 'media' + if getComputedStyle(d.body).color is 'rgb(196, 151, 86)' # not blocked + $.addClass doc, 'spooky' + return + if g.VIEW is 'catalog' $.addClass doc, $.id('base-css').href.match(/catalog_(\w+)/)[1].replace('_new', '').replace /_+/g, '-' return @@ -190,7 +196,7 @@ Main = setStyle = -> $.rmClass doc, style for styleSheet in styleSheets - if styleSheet.href is mainStyleSheet.href + if styleSheet.href is mainStyleSheet?.href style = styleSheet.title.toLowerCase().replace('new', '').trim().replace /\s+/g, '-' break $.addClass doc, style @@ -361,7 +367,7 @@ Main = $.ready -> cb() if Main.isThisPageLegit() - css: `<%= importCSS('font-awesome', 'style', 'yotsuba', 'yotsuba-b', 'futaba', 'burichan', 'tomorrow', 'photon') %>` + css: `<%= importCSS('font-awesome', 'style', 'yotsuba', 'yotsuba-b', 'futaba', 'burichan', 'tomorrow', 'photon', 'spooky') %>` cssWWW: `<%= importCSS('www') %>` diff --git a/src/General/css/spooky.css b/src/General/css/spooky.css new file mode 100755 index 000000000..94898e321 --- /dev/null +++ b/src/General/css/spooky.css @@ -0,0 +1,132 @@ +/* General */ +:root.spooky .dialog { + background-color: #171526; + border-color: #707070; +} +:root.spooky .field:focus, +:root.spooky .field.focus { + border-color: #98E; +} + +/* Header */ +:root.spooky #header-bar.dialog { + background-color: rgba(23,21,38,0.98); +} +:root.spooky:not(.fixed) #header-bar, :root.spooky #notifications { + font-size: 9pt; +} +:root.spooky #header-bar, :root.spooky #notifications { + color: #C49756; +} +:root.spooky #board-list a, :root.spooky #shortcuts a { + color: #FE9600; +} +:root.spooky.fixed #custom-board-list .current:hover { + border-bottom-color: rgba(255,0,0,0.2); +} + +/* Settings */ +:root.spooky #fourchanx-settings fieldset, :root.spooky .section-main div::before { + border-color: #707070; +} +:root.spooky .suboption-list > div:last-of-type { + background-color: #171526; +} + +/* Quote */ +:root.spooky .catalog-thread > .comment > span.quote, :root.spooky #arc-list span.quote { + color: #634C2C; +} +:root.spooky .backlink.deadlink { + color: #FE9600 !important; +} +:root.spooky .inline { + border-color: #707070; + background-color: rgba(255, 255, 255, .14); +} + +/* QR */ +.spooky #dump-list::-webkit-scrollbar-thumb { + background-color: #171526; + border-color: #707070; +} +:root.spooky .qr-preview { + background-color: rgba(0, 0, 0, .15); +} + +:root.spooky #qr .field { + background-color: rgb(26, 27, 29); + color: rgb(197,200,198); + border-color: rgb(40, 41, 42); +} +:root.spooky #qr .field:focus, +:root.spooky #qr .field.focus { + border-color: rgb(254, 150, 0) !important; + background-color: rgb(30,32,36); +} +:root.spooky .persona button { + background: linear-gradient(to bottom, #2E3035, #222427) no-repeat; + color: rgb(197,200,198); + border-color: rgb(40, 41, 42); + outline: none; +} +:root.spooky .persona button::-moz-focus-inner { + border: none; +} +:root.spooky .persona button:focus { + border-color: rgb(254, 150, 0); +} +:root.spooky #qr.sjis-preview #sjis-toggle, +:root.spooky #qr.tex-preview #tex-preview-button { + background: rgb(26, 27, 29); +} +:root.spooky #qr select, +:root.spooky #file-n-submit > input, +:root.spooky #qr-draw-button { + border-color: rgb(40, 41, 42); +} +:root.spooky #qr-filename { + color: rgb(197,200,198); +} + +:root.spooky .qr-link { + border-color: rgb(8, 6, 23) rgb(8, 6, 23) rgb(0, 0, 8); + background: linear-gradient(#262435, #171526) repeat scroll 0% 0% transparent; +} +:root.spooky .qr-link:hover { + background: #1A1829; +} + + +/* Menu */ +:root.spooky #menu { + color: #FE9600; +} +:root.spooky .entry { + font-size: 10pt; +} +:root.spooky .focused.entry { + background: rgba(255, 255, 255, .33); +} + +/* Unread */ +:root.spooky #unread-line { + border-color: rgb(197, 200, 198); +} + +/* Thread Watcher */ +:root.spooky .replies-quoting-you > a, :root.spooky #watcher-link.disabled.replies-quoting-you { + color: #F00 !important; +} + +/* Watcher Favicon */ +:root.spooky .watch-thread-link +{ + background-image: url("data:image/svg+xml,"); +} + +/* Board Title */ +:root.spooky div.boardTitle { + font-family: sans-serif !important; + text-shadow: 1px 1px 1px rgba(105,10,15,0.6); +} diff --git a/src/Posting/Captcha.v2.coffee b/src/Posting/Captcha.v2.coffee index 92929ba00..059f7080c 100644 --- a/src/Posting/Captcha.v2.coffee +++ b/src/Posting/Captcha.v2.coffee @@ -112,7 +112,7 @@ Captcha.v2 = var container = document.querySelector("#qr .captcha-container"); container.dataset.widgetID = window.grecaptcha.render(container, { sitekey: '<%= meta.recaptchaKey %>', - theme: document.documentElement.classList.contains('tomorrow') ? 'dark' : 'light', + theme: (document.documentElement.classList.contains('tomorrow') || document.documentElement.classList.contains('spooky')) ? 'dark' : 'light', callback: function(response) { window.dispatchEvent(new CustomEvent("captcha:success", {detail: response})); }