diff options
| author | Sean King <seanking2919@protonmail.com> | 2022-08-01 18:17:09 -0600 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2022-08-01 18:17:09 -0600 |
| commit | 081aa0fd0552732f208bd35e37cde06c66536791 (patch) | |
| tree | 053827cd9d9b258d6752195ab09eabd37d4c813b /src/components/mobile_nav/mobile_nav.vue | |
| parent | 75216c5feb32b32e24952663ffa4233410585785 (diff) | |
| parent | 3fc9673a7d0fb851283e4ed687c2fd7790f03317 (diff) | |
Fix merge conflicts
Diffstat (limited to 'src/components/mobile_nav/mobile_nav.vue')
| -rw-r--r-- | src/components/mobile_nav/mobile_nav.vue | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue index d2d48a03..949cf17e 100644 --- a/src/components/mobile_nav/mobile_nav.vue +++ b/src/components/mobile_nav/mobile_nav.vue @@ -67,11 +67,10 @@ </a> </div> <div - class="mobile-notifications" id="mobile-notifications" + class="mobile-notifications" @scroll="onScroll" - > - </div> + /> </div> <SideDrawer ref="sideDrawer" @@ -86,6 +85,8 @@ @import '../../_variables.scss'; .MobileNav { + z-index: var(--ZI_navbar); + .mobile-nav { display: grid; line-height: var(--navbar-height); @@ -147,7 +148,7 @@ transition-property: transform; transition-duration: 0.25s; transform: translateX(0); - z-index: 1001; + z-index: var(--ZI_navbar); -webkit-overflow-scrolling: touch; &.-closed { @@ -160,7 +161,7 @@ display: flex; align-items: center; justify-content: space-between; - z-index: 1; + z-index: calc(var(--ZI_navbar) + 100); width: 100%; height: 50px; line-height: 50px; |