logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: cb6b96b9ba4e71310e823aecc4bb8c22d370397a
parent 91422367d35372bd5977a5c091c80647e2628f6e
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Mon, 22 Aug 2022 22:58:57 +0000

Merge branch 'zindexes-fix' into 'develop'

Fix various issues related to z-indexes

See merge request pleroma/pleroma-fe!1617

Diffstat:

Msrc/App.scss17+++++++++++------
Msrc/components/global_notice_list/global_notice_list.vue4++--
2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/App.scss b/src/App.scss @@ -5,12 +5,12 @@ --navbar-height: 3.5rem; --post-line-height: 1.4; // Z-Index stuff - --ZI_media_modal: 90000; - --ZI_modals_popovers: 85000; - --ZI_modals: 80000; - --ZI_navbar_popovers: 75000; - --ZI_navbar: 70000; - --ZI_popovers: 60000; + --ZI_media_modal: 9000; + --ZI_modals_popovers: 8500; + --ZI_modals: 8000; + --ZI_navbar_popovers: 7500; + --ZI_navbar: 7000; + --ZI_popovers: 6000; } html { @@ -141,6 +141,11 @@ nav { grid-area: sidebar; } +#modal { + position: absolute; + z-index: var(--ZI_modals); +} + .column.-scrollable { top: var(--navbar-height); position: sticky; diff --git a/src/components/global_notice_list/global_notice_list.vue b/src/components/global_notice_list/global_notice_list.vue @@ -29,10 +29,10 @@ .global-notice-list { position: fixed; - top: 50px; + top: calc(var(--navbar-height) + 0.5em); width: 100%; pointer-events: none; - z-index: var(--ZI_popovers); + z-index: var(--ZI_navbar_popovers); display: flex; flex-direction: column; align-items: center;