diff options
| author | Sean King <seanking2919@protonmail.com> | 2022-08-07 06:38:56 +0000 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2022-08-07 06:38:56 +0000 |
| commit | 572f28d7c9efea4300cb88063baf4daab91e7910 (patch) | |
| tree | 29d966a1b7141f6a768120497d3f34143f467212 /src/App.scss | |
| parent | 18d69f93d38dc15a74db81ee4c10b4766bebfc35 (diff) | |
| parent | 6a2f4270727913b8e5d4670b5b3bbc3f57f51ec5 (diff) | |
Merge branch 'fix/merge-conflicts/report-notifications' into 'feat/report-notification'
Fixing merge conflicts and lint for report notifications MR
See merge request pleroma/pleroma-fe!1585
Diffstat (limited to 'src/App.scss')
| -rw-r--r-- | src/App.scss | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/App.scss b/src/App.scss index 7e6d0dfc..ab025d63 100644 --- a/src/App.scss +++ b/src/App.scss @@ -4,6 +4,13 @@ :root { --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; } html { @@ -117,7 +124,7 @@ i[class*=icon-], } nav { - z-index: 1000; + z-index: var(--ZI_navbar); color: var(--topBarText); background-color: $fallback--fg; background-color: var(--topBar, $fallback--fg); @@ -828,7 +835,7 @@ option { // Vue transitions .fade-enter-active, .fade-leave-active { - transition: opacity 0.2s; + transition: opacity 0.3s; } .fade-enter-from, |