From f5c4bf379feeab39b20e4564bb1d1b20ea386fba Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sun, 12 Oct 2014 10:43:26 -0700 Subject: [PATCH] Revert "Revert "Fix error notifications in gallery another way."" This reverts commit d71d2e6edcf32edc47d7d01c154bac68c19f10b2. --- src/General/css/style.css | 14 +++++++++----- src/Images/Gallery.coffee | 2 ++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/General/css/style.css b/src/General/css/style.css index 2b812c360..40d397a19 100755 --- a/src/General/css/style.css +++ b/src/General/css/style.css @@ -132,7 +132,7 @@ hr + div.center:not(.ad-cnt):not(.topad):not(.middlead):not(.bottomad) { #navlinks, #updater, #thread-stats { z-index: 40; } -.fixed #header-bar.autohide { +:root.fixed #header-bar { z-index: 35; } #qr { @@ -144,9 +144,6 @@ hr + div.center:not(.ad-cnt):not(.topad):not(.middlead):not(.bottomad) { :root.fixed-watcher #thread-watcher { z-index: 20; } -.fixed #header-bar { - z-index: 10; -} /* Header */ .fixed.top-header body { padding-top: 2em; @@ -288,8 +285,10 @@ hr + div.center:not(.ad-cnt):not(.topad):not(.middlead):not(.bottomad) { right: 0; left: 0; transition: all .8s .6s cubic-bezier(.55, .055, .675, .19); + visibility: visible; } -.fixed.top-header #header-bar #notifications { +:root.fixed.top-header:not(.gallery-open) #header-bar #notifications, +:root.fixed.top-header #header-bar.autohide #notifications { position: absolute; top: 100%; } @@ -1647,6 +1646,11 @@ div.boardTitle { .field[name="Slide Delay"] { width: 4em; } +:root.gallery-open.fixed #header-bar:not(.autohide), +:root.gallery-open.fixed #header-bar:not(.autohide) .fa::before { + visibility: hidden; +} + @media screen and (resolution: 1dppx) { .fa-bars { font-size: 14px; diff --git a/src/Images/Gallery.coffee b/src/Images/Gallery.coffee index f9ec10794..788d94215 100644 --- a/src/Images/Gallery.coffee +++ b/src/Images/Gallery.coffee @@ -78,6 +78,7 @@ Gallery = candidate = post.file.thumb.parentNode if Header.getTopOf(candidate) + candidate.getBoundingClientRect().height >= 0 image = candidate + $.addClass doc, 'gallery-open' $.add d.body, dialog nodes.thumbs.scrollTop = 0 @@ -259,6 +260,7 @@ Gallery = close: -> Gallery.nodes.current.pause?() $.rm Gallery.nodes.el + $.rmClass doc, 'gallery-open' delete Gallery.nodes delete Gallery.fullIDs doc.style.overflow = ''