diff --git a/src/classes/Post.coffee b/src/classes/Post.coffee index 57e455b92..a7d92f5b7 100644 --- a/src/classes/Post.coffee +++ b/src/classes/Post.coffee @@ -260,6 +260,6 @@ class Post return setCatalogOP: (isCatalogOP) -> - @nodes.root.classList.toggle 'catalog-postContainer', isCatalogOP + @nodes.root.classList.toggle 'catalog-container', isCatalogOP @nodes.root.classList.toggle 'opContainer', !isCatalogOP @nodes.post.classList.toggle 'catalog-post', isCatalogOP diff --git a/src/css/burichan.css b/src/css/burichan.css index 8f869b907..f432dabb7 100644 --- a/src/css/burichan.css +++ b/src/css/burichan.css @@ -31,13 +31,13 @@ } /* Catalog */ -:root.burichan.catalog-hover-expand .catalog-postContainer:hover > .post { +:root.burichan.catalog-hover-expand .catalog-container:hover > .post { background-color: #D6DAF0; } :root.burichan.werkTyme .catalog-thread:not(:hover), :root.burichan.werkTyme:not(.catalog-hover-expand) .catalog-thread, -:root.burichan.catalog-hover-expand .catalog-postContainer:hover > .post, -:root.burichan.catalog-hover-expand .catalog-postContainer:hover .catalog-reply { +:root.burichan.catalog-hover-expand .catalog-container:hover > .post, +:root.burichan.catalog-hover-expand .catalog-container:hover .catalog-reply { border-color: #B7C5D9; } diff --git a/src/css/futaba.css b/src/css/futaba.css index 9130dc0c9..09ffa7cba 100644 --- a/src/css/futaba.css +++ b/src/css/futaba.css @@ -31,13 +31,13 @@ } /* Catalog */ -:root.futaba.catalog-hover-expand .catalog-postContainer:hover > .post { +:root.futaba.catalog-hover-expand .catalog-container:hover > .post { background-color: #F0E0D6; } :root.futaba.werkTyme .catalog-thread:not(:hover), :root.futaba.werkTyme:not(.catalog-hover-expand) .catalog-thread, -:root.futaba.catalog-hover-expand .catalog-postContainer:hover > .post, -:root.futaba.catalog-hover-expand .catalog-postContainer:hover .catalog-reply { +:root.futaba.catalog-hover-expand .catalog-container:hover > .post, +:root.futaba.catalog-hover-expand .catalog-container:hover .catalog-reply { border-color: #D9BFB7; } diff --git a/src/css/photon.css b/src/css/photon.css index 1ef404587..cddb1146b 100644 --- a/src/css/photon.css +++ b/src/css/photon.css @@ -31,13 +31,13 @@ } /* Catalog */ -:root.photon.catalog-hover-expand .catalog-postContainer:hover > .post { +:root.photon.catalog-hover-expand .catalog-container:hover > .post { background-color: #DDD; } :root.photon.werkTyme .catalog-thread:not(:hover), :root.photon.werkTyme:not(.catalog-hover-expand) .catalog-thread, -:root.photon.catalog-hover-expand .catalog-postContainer:hover > .post, -:root.photon.catalog-hover-expand .catalog-postContainer:hover .catalog-reply { +:root.photon.catalog-hover-expand .catalog-container:hover > .post, +:root.photon.catalog-hover-expand .catalog-container:hover .catalog-reply { border-color: #CCC; } diff --git a/src/css/style.css b/src/css/style.css index 1ba32f582..8b53fba18 100644 --- a/src/css/style.css +++ b/src/css/style.css @@ -732,18 +732,18 @@ div.catalog-thread { width: 270px; height: 410px; } -.catalog-postContainer { +.catalog-container { position: absolute; top: -4px; left: 0; right: 0; bottom: 0; } -.catalog-postContainer:not(:hover), -:root:not(.catalog-hover-expand) .catalog-postContainer { +.catalog-container:not(:hover), +:root:not(.catalog-hover-expand) .catalog-container { overflow: hidden; } -:root.catalog-hover-expand .catalog-postContainer:hover { +:root.catalog-hover-expand .catalog-container:hover { z-index: 1; } .catalog-post { @@ -761,11 +761,11 @@ div.catalog-post { margin-top: -7px; padding-top: 6px; } -:root.catalog-hover-expand .catalog-postContainer:hover > .catalog-post { +:root.catalog-hover-expand .catalog-container:hover > .catalog-post { margin-left: -61px; margin-right: -61px; } -:root.catalog-hover-expand .catalog-postContainer:hover > * > :not(.catalog-replies) { +:root.catalog-hover-expand .catalog-container:hover > * > :not(.catalog-replies) { padding-left: 2px; padding-right: 2px; } @@ -818,13 +818,13 @@ div.catalog-post { margin: 0; padding-bottom: .3em; } -.catalog-postContainer:not(:hover) > * > .file, -.catalog-postContainer:not(:hover) > * > .postInfo > :not(.subject), -.catalog-postContainer:not(:hover) > * > .catalog-replies, -:root:not(.catalog-hover-expand) .catalog-postContainer > * > .file, -:root:not(.catalog-hover-expand) .catalog-postContainer > * > .postInfo > :not(.subject), -:root:not(.catalog-hover-expand) .catalog-postContainer > * > .catalog-replies, -.catalog-thread > .catalog-postContainer > :not(.catalog-post), +.catalog-container:not(:hover) > * > .file, +.catalog-container:not(:hover) > * > .postInfo > :not(.subject), +.catalog-container:not(:hover) > * > .catalog-replies, +:root:not(.catalog-hover-expand) .catalog-container > * > .file, +:root:not(.catalog-hover-expand) .catalog-container > * > .postInfo > :not(.subject), +:root:not(.catalog-hover-expand) .catalog-container > * > .catalog-replies, +.catalog-thread > .catalog-container > :not(.catalog-post), .catalog-post > .file > :not(.fileText), .catalog-post > * > .fileText > :not(:first-child), .catalog-post > .postInfo > :not(.subject):not(.nameBlock):not(.dateTime), @@ -870,7 +870,7 @@ div.catalog-post > div.postInfo { } .catalog-post > * > .nameBlock, .catalog-post > * > .dateTime, -:root.catalog-hover-expand .catalog-postContainer:hover > * > .postMessage:not(:empty) { +:root.catalog-hover-expand .catalog-container:hover > * > .postMessage:not(:empty) { padding-top: .3em; } .catalog-reply { @@ -1322,13 +1322,13 @@ input[name="Default Volume"] { .catalog-thread.filter-highlight .catalog-thumb, :root.werkTyme .catalog-thread.filter-highlight:not(:hover), :root.werkTyme:not(.catalog-hover-expand) .catalog-thread.filter-highlight, -:root.werkTyme.catalog-hover-expand .catalog-thread.filter-highlight > .catalog-postContainer:hover > .catalog-post { +:root.werkTyme.catalog-hover-expand .catalog-thread.filter-highlight > .catalog-container:hover > .catalog-post { box-shadow: 0 0 3px 3px rgba(255, 0, 0, .5); } .catalog-thread.watched .catalog-thumb, :root.werkTyme .catalog-thread.watched:not(:hover), :root.werkTyme:not(.catalog-hover-expand) .catalog-thread.watched, -:root.werkTyme.catalog-hover-expand .catalog-thread.watched > .catalog-postContainer:hover > .catalog-post { +:root.werkTyme.catalog-hover-expand .catalog-thread.watched > .catalog-container:hover > .catalog-post { outline: 2px solid rgba(255, 0, 0, .75); } diff --git a/src/css/tomorrow.css b/src/css/tomorrow.css index 338bf826c..f208ca4c2 100644 --- a/src/css/tomorrow.css +++ b/src/css/tomorrow.css @@ -30,13 +30,13 @@ } /* Catalog */ -:root.tomorrow.catalog-hover-expand .catalog-postContainer:hover > .post { +:root.tomorrow.catalog-hover-expand .catalog-container:hover > .post { background-color: #282A2E; } :root.tomorrow.werkTyme .catalog-thread:not(:hover), :root.tomorrow.werkTyme:not(.catalog-hover-expand) .catalog-thread, -:root.tomorrow.catalog-hover-expand .catalog-postContainer:hover > .post, -:root.tomorrow.catalog-hover-expand .catalog-postContainer:hover .catalog-reply { +:root.tomorrow.catalog-hover-expand .catalog-container:hover > .post, +:root.tomorrow.catalog-hover-expand .catalog-container:hover .catalog-reply { border-color: #111; } @@ -81,13 +81,13 @@ :root.tomorrow .catalog-thread.filter-highlight .catalog-thumb, :root.tomorrow.werkTyme .catalog-thread.filter-highlight:not(:hover), :root.tomorrow.werkTyme:not(.catalog-hover-expand) .catalog-thread.filter-highlight, -:root.tomorrow.werkTyme.catalog-hover-expand .catalog-thread.filter-highlight > .catalog-postContainer:hover > .catalog-post { +:root.tomorrow.werkTyme.catalog-hover-expand .catalog-thread.filter-highlight > .catalog-container:hover > .catalog-post { box-shadow: 0 0 3px 3px rgba(64, 192, 255, .7); } :root.tomorrow .catalog-thread.watched .catalog-thumb, :root.tomorrow.werkTyme .catalog-thread.watched:not(:hover), :root.tomorrow.werkTyme:not(.catalog-hover-expand) .catalog-thread.watched, -:root.tomorrow.werkTyme.catalog-hover-expand .catalog-thread.watched > .catalog-postContainer:hover > .catalog-post { +:root.tomorrow.werkTyme.catalog-hover-expand .catalog-thread.watched > .catalog-container:hover > .catalog-post { outline: 2px solid rgb(64, 192, 255); } diff --git a/src/css/yotsuba-b.css b/src/css/yotsuba-b.css index 39460fadc..1f79971f9 100644 --- a/src/css/yotsuba-b.css +++ b/src/css/yotsuba-b.css @@ -31,13 +31,13 @@ } /* Catalog */ -:root.yotsuba-b.catalog-hover-expand .catalog-postContainer:hover > .post { +:root.yotsuba-b.catalog-hover-expand .catalog-container:hover > .post { background-color: #D6DAF0; } :root.yotsuba-b.werkTyme .catalog-thread:not(:hover), :root.yotsuba-b.werkTyme:not(.catalog-hover-expand) .catalog-thread, -:root.yotsuba-b.catalog-hover-expand .catalog-postContainer:hover > .post, -:root.yotsuba-b.catalog-hover-expand .catalog-postContainer:hover .catalog-reply { +:root.yotsuba-b.catalog-hover-expand .catalog-container:hover > .post, +:root.yotsuba-b.catalog-hover-expand .catalog-container:hover .catalog-reply { border-color: #B7C5D9; } diff --git a/src/css/yotsuba.css b/src/css/yotsuba.css index bd32f58d5..645d582c6 100644 --- a/src/css/yotsuba.css +++ b/src/css/yotsuba.css @@ -31,13 +31,13 @@ } /* Catalog */ -:root.yotsuba.catalog-hover-expand .catalog-postContainer:hover > .post { +:root.yotsuba.catalog-hover-expand .catalog-container:hover > .post { background-color: #F0E0D6; } :root.yotsuba.werkTyme .catalog-thread:not(:hover), :root.yotsuba.werkTyme:not(.catalog-hover-expand) .catalog-thread, -:root.yotsuba.catalog-hover-expand .catalog-postContainer:hover > .post, -:root.yotsuba.catalog-hover-expand .catalog-postContainer:hover .catalog-reply { +:root.yotsuba.catalog-hover-expand .catalog-container:hover > .post, +:root.yotsuba.catalog-hover-expand .catalog-container:hover .catalog-reply { border-color: #D9BFB7; } diff --git a/src/main/Main.coffee b/src/main/Main.coffee index f44059aae..2a2dc5232 100644 --- a/src/main/Main.coffee +++ b/src/main/Main.coffee @@ -229,7 +229,7 @@ Main = bgColor = window.getComputedStyle(div).backgroundColor $.rm div Main.bgColorStyle.textContent = """ - .dialog, .suboption-list > div:last-of-type, :root.catalog-hover-expand .catalog-postContainer:hover > .post { + .dialog, .suboption-list > div:last-of-type, :root.catalog-hover-expand .catalog-container:hover > .post { background-color: #{bgColor}; } """