diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-08-22 22:58:57 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-08-22 22:58:57 +0000 |
| commit | cb6b96b9ba4e71310e823aecc4bb8c22d370397a (patch) | |
| tree | 9d3fa6be6c2d7a472874450b95d7a80361aacb4d | |
| parent | 91422367d35372bd5977a5c091c80647e2628f6e (diff) | |
| parent | 1a24f8b4c155edc3834ce901a167e463c609cf2f (diff) | |
Merge branch 'zindexes-fix' into 'develop'
Fix various issues related to z-indexes
See merge request pleroma/pleroma-fe!1617
| -rw-r--r-- | src/App.scss | 17 | ||||
| -rw-r--r-- | src/components/global_notice_list/global_notice_list.vue | 4 |
2 files changed, 13 insertions, 8 deletions
diff --git a/src/App.scss b/src/App.scss index e5bc4c54..dec187af 100644 --- 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 index 09904761..d828b819 100644 --- 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; |