diff --git a/CHANGELOG.md b/CHANGELOG.md index d6e8f09bd..7ce1378f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## v1.13.0 +**v1.13.0.2** *(2016-10-01)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.2/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.2/builds/4chan-X-noupdate.crx)] +- Party hat CSS tweaks. + **v1.13.0.1** *(2016-10-01)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.1/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.1/builds/4chan-X-noupdate.crx)] - Merge v1.12.3.5: Fix cooldowns. - Merge v1.12.3.5: Fix party hat alignment when Thread Hiding Buttons are enabled. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 5d0613fb4..302d40c19 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 faed8d0a2..00be89127 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.13.0.1 +// @version 1.13.0.2 // @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 c2d842a10..ed420fcff 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.13.0.1 +// @version 1.13.0.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -136,7 +136,7 @@ docSet = function() { }; g = { - VERSION: '1.13.0.1', + VERSION: '1.13.0.2', NAMESPACE: '4chan X.', boards: {} }; @@ -1901,6 +1901,9 @@ div[data-checked=\"false\"] > .suboption-list {\n\ width: 270px;\n\ height: 410px;\n\ }\n\ +:root.catalog-hover-expand .catalog-thread:hover {\n\ + z-index: 1;\n\ +}\n\ .catalog-container {\n\ position: absolute;\n\ top: -4px;\n\ @@ -1912,9 +1915,6 @@ div[data-checked=\"false\"] > .suboption-list {\n\ :root:not(.catalog-hover-expand) .catalog-container {\n\ overflow: hidden;\n\ }\n\ -:root.catalog-hover-expand .catalog-container:hover {\n\ - z-index: 1;\n\ -}\n\ .catalog-post {\n\ position: absolute;\n\ top: 4px;\n\ @@ -2102,17 +2102,23 @@ div[data-checked=\"false\"] > .suboption-list {\n\ background-size: contain;\n\ }\n\ :root.hats-enabled .catalog-small > .catalog-thread::after {\n\ - left: -10px;\n\ - top: -65px;\n\ - width: 100px;\n\ - height: 100px;\n\ + left: -8px;\n\ + top: -59px;\n\ + width: 96px;\n\ + height: 96px;\n\ +}\n\ +:root.hats-enabled:not(.werkTyme) .catalog-small > .catalog-thread:not(.noFile)::after {\n\ + left: calc(67px - .3px * var(--tn-w));\n\ }\n\ :root.hats-enabled .catalog-large > .catalog-thread::after {\n\ left: -15px;\n\ - top: -105px;\n\ + top: -98px;\n\ width: 160px;\n\ height: 160px;\n\ }\n\ +:root.hats-enabled:not(.werkTyme) .catalog-large > .catalog-thread:not(.noFile)::after {\n\ + left: calc(110px - .5px * var(--tn-w));\n\ +}\n\ /* Announcement Hiding */\n\ :root.hide-announcement #globalMessage {\n\ display: none;\n\ @@ -8101,8 +8107,9 @@ Build = (function() { return root; }, catalogThread: function(thread, data, pageCount) { - var container, fileCount, gifIcon, imgClass, postCount, root, spoilerRange, src, staticPath; + var container, cssText, fileCount, gifIcon, imgClass, postCount, ratio, root, spoilerRange, src, staticPath, tn_h, tn_w; staticPath = Build.staticPath, gifIcon = Build.gifIcon; + tn_w = data.tn_w, tn_h = data.tn_h; if (data.spoiler && !Conf['Reveal Spoiler Thumbnails']) { src = staticPath + "spoiler"; if (spoilerRange = Build.spoilerRange[thread.board]) { @@ -8110,11 +8117,14 @@ Build = (function() { } src += '.png'; imgClass = 'spoiler-file'; + cssText = "--tn-w: 100; --tn-h: 100;"; } else if (data.filedeleted) { src = staticPath + "filedeleted-res" + gifIcon; imgClass = 'deleted-file'; } else if (thread.OP.file) { src = thread.OP.file.thumbURL; + ratio = 250 / Math.max(tn_w, tn_h); + cssText = "--tn-w: " + (tn_w * ratio) + "; --tn-h: " + (tn_h * ratio) + ";"; } else { src = staticPath + "nofile.png"; imgClass = 'no-file'; @@ -8135,6 +8145,7 @@ Build = (function() { if (!thread.OP.file) { $.addClass(root, 'noFile'); } + root.style.cssText = cssText || ''; return root; }, catalogReply: function(thread, data) { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 09a559b8c..51445fc77 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 7c0d44ae2..8bd66939e 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.13.0.1 +// @version 1.13.0.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -136,7 +136,7 @@ docSet = function() { }; g = { - VERSION: '1.13.0.1', + VERSION: '1.13.0.2', NAMESPACE: '4chan X.', boards: {} }; @@ -1901,6 +1901,9 @@ div[data-checked=\"false\"] > .suboption-list {\n\ width: 270px;\n\ height: 410px;\n\ }\n\ +:root.catalog-hover-expand .catalog-thread:hover {\n\ + z-index: 1;\n\ +}\n\ .catalog-container {\n\ position: absolute;\n\ top: -4px;\n\ @@ -1912,9 +1915,6 @@ div[data-checked=\"false\"] > .suboption-list {\n\ :root:not(.catalog-hover-expand) .catalog-container {\n\ overflow: hidden;\n\ }\n\ -:root.catalog-hover-expand .catalog-container:hover {\n\ - z-index: 1;\n\ -}\n\ .catalog-post {\n\ position: absolute;\n\ top: 4px;\n\ @@ -2102,17 +2102,23 @@ div[data-checked=\"false\"] > .suboption-list {\n\ background-size: contain;\n\ }\n\ :root.hats-enabled .catalog-small > .catalog-thread::after {\n\ - left: -10px;\n\ - top: -65px;\n\ - width: 100px;\n\ - height: 100px;\n\ + left: -8px;\n\ + top: -59px;\n\ + width: 96px;\n\ + height: 96px;\n\ +}\n\ +:root.hats-enabled:not(.werkTyme) .catalog-small > .catalog-thread:not(.noFile)::after {\n\ + left: calc(67px - .3px * var(--tn-w));\n\ }\n\ :root.hats-enabled .catalog-large > .catalog-thread::after {\n\ left: -15px;\n\ - top: -105px;\n\ + top: -98px;\n\ width: 160px;\n\ height: 160px;\n\ }\n\ +:root.hats-enabled:not(.werkTyme) .catalog-large > .catalog-thread:not(.noFile)::after {\n\ + left: calc(110px - .5px * var(--tn-w));\n\ +}\n\ /* Announcement Hiding */\n\ :root.hide-announcement #globalMessage {\n\ display: none;\n\ @@ -8101,8 +8107,9 @@ Build = (function() { return root; }, catalogThread: function(thread, data, pageCount) { - var container, fileCount, gifIcon, imgClass, postCount, root, spoilerRange, src, staticPath; + var container, cssText, fileCount, gifIcon, imgClass, postCount, ratio, root, spoilerRange, src, staticPath, tn_h, tn_w; staticPath = Build.staticPath, gifIcon = Build.gifIcon; + tn_w = data.tn_w, tn_h = data.tn_h; if (data.spoiler && !Conf['Reveal Spoiler Thumbnails']) { src = staticPath + "spoiler"; if (spoilerRange = Build.spoilerRange[thread.board]) { @@ -8110,11 +8117,14 @@ Build = (function() { } src += '.png'; imgClass = 'spoiler-file'; + cssText = "--tn-w: 100; --tn-h: 100;"; } else if (data.filedeleted) { src = staticPath + "filedeleted-res" + gifIcon; imgClass = 'deleted-file'; } else if (thread.OP.file) { src = thread.OP.file.thumbURL; + ratio = 250 / Math.max(tn_w, tn_h); + cssText = "--tn-w: " + (tn_w * ratio) + "; --tn-h: " + (tn_h * ratio) + ";"; } else { src = staticPath + "nofile.png"; imgClass = 'no-file'; @@ -8135,6 +8145,7 @@ Build = (function() { if (!thread.OP.file) { $.addClass(root, 'noFile'); } + root.style.cssText = cssText || ''; return root; }, catalogReply: function(thread, data) { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 220ec124f..38ad3fc3b 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 5f27b393f..6e4d22eb7 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.13.0.1 +// @version 1.13.0.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 9f3c5d6aa..b5124e7a1 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.13.0.1 +// @version 1.13.0.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -136,7 +136,7 @@ docSet = function() { }; g = { - VERSION: '1.13.0.1', + VERSION: '1.13.0.2', NAMESPACE: '4chan X.', boards: {} }; @@ -1901,6 +1901,9 @@ div[data-checked=\"false\"] > .suboption-list {\n\ width: 270px;\n\ height: 410px;\n\ }\n\ +:root.catalog-hover-expand .catalog-thread:hover {\n\ + z-index: 1;\n\ +}\n\ .catalog-container {\n\ position: absolute;\n\ top: -4px;\n\ @@ -1912,9 +1915,6 @@ div[data-checked=\"false\"] > .suboption-list {\n\ :root:not(.catalog-hover-expand) .catalog-container {\n\ overflow: hidden;\n\ }\n\ -:root.catalog-hover-expand .catalog-container:hover {\n\ - z-index: 1;\n\ -}\n\ .catalog-post {\n\ position: absolute;\n\ top: 4px;\n\ @@ -2102,17 +2102,23 @@ div[data-checked=\"false\"] > .suboption-list {\n\ background-size: contain;\n\ }\n\ :root.hats-enabled .catalog-small > .catalog-thread::after {\n\ - left: -10px;\n\ - top: -65px;\n\ - width: 100px;\n\ - height: 100px;\n\ + left: -8px;\n\ + top: -59px;\n\ + width: 96px;\n\ + height: 96px;\n\ +}\n\ +:root.hats-enabled:not(.werkTyme) .catalog-small > .catalog-thread:not(.noFile)::after {\n\ + left: calc(67px - .3px * var(--tn-w));\n\ }\n\ :root.hats-enabled .catalog-large > .catalog-thread::after {\n\ left: -15px;\n\ - top: -105px;\n\ + top: -98px;\n\ width: 160px;\n\ height: 160px;\n\ }\n\ +:root.hats-enabled:not(.werkTyme) .catalog-large > .catalog-thread:not(.noFile)::after {\n\ + left: calc(110px - .5px * var(--tn-w));\n\ +}\n\ /* Announcement Hiding */\n\ :root.hide-announcement #globalMessage {\n\ display: none;\n\ @@ -8101,8 +8107,9 @@ Build = (function() { return root; }, catalogThread: function(thread, data, pageCount) { - var container, fileCount, gifIcon, imgClass, postCount, root, spoilerRange, src, staticPath; + var container, cssText, fileCount, gifIcon, imgClass, postCount, ratio, root, spoilerRange, src, staticPath, tn_h, tn_w; staticPath = Build.staticPath, gifIcon = Build.gifIcon; + tn_w = data.tn_w, tn_h = data.tn_h; if (data.spoiler && !Conf['Reveal Spoiler Thumbnails']) { src = staticPath + "spoiler"; if (spoilerRange = Build.spoilerRange[thread.board]) { @@ -8110,11 +8117,14 @@ Build = (function() { } src += '.png'; imgClass = 'spoiler-file'; + cssText = "--tn-w: 100; --tn-h: 100;"; } else if (data.filedeleted) { src = staticPath + "filedeleted-res" + gifIcon; imgClass = 'deleted-file'; } else if (thread.OP.file) { src = thread.OP.file.thumbURL; + ratio = 250 / Math.max(tn_w, tn_h); + cssText = "--tn-w: " + (tn_w * ratio) + "; --tn-h: " + (tn_h * ratio) + ";"; } else { src = staticPath + "nofile.png"; imgClass = 'no-file'; @@ -8135,6 +8145,7 @@ Build = (function() { if (!thread.OP.file) { $.addClass(root, 'noFile'); } + root.style.cssText = cssText || ''; return root; }, catalogReply: function(thread, data) { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 53f0c5db1..367fe9cca 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 b0171de66..5a21db966 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 b7f5395c6..a2f41ac2c 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index a89324d82..fbe1e86fd 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.13.0.1", - "date": "2016-10-01T12:26:42.104Z" + "version": "1.13.0.2", + "date": "2016-10-01T15:41:58.921Z" } \ No newline at end of file