Yuki Takei 5 лет назад
Родитель
Сommit
febd19429e
1 измененных файлов с 12 добавлено и 16 удалено
  1. 12 16
      src/client/styles/scss/_sidebar.scss

+ 12 - 16
src/client/styles/scss/_sidebar.scss

@@ -21,7 +21,6 @@
   // sticky
   // sticky
   position: sticky;
   position: sticky;
   top: $grw-navbar-border-width;
   top: $grw-navbar-border-width;
-  z-index: $zindex-sticky;
 
 
   .ak-navigation-resize-button {
   .ak-navigation-resize-button {
     position: fixed;
     position: fixed;
@@ -58,8 +57,6 @@
   // override @atlaskit/navigation-next styles
   // override @atlaskit/navigation-next styles
   $navbar-total-height: $grw-navbar-height + $grw-navbar-border-width;
   $navbar-total-height: $grw-navbar-height + $grw-navbar-border-width;
   div[data-layout-container='true'] {
   div[data-layout-container='true'] {
-    max-height: calc(100vh - #{$grw-navbar-border-width});
-
     // css-teprsg
     // css-teprsg
     > div:nth-of-type(2) {
     > div:nth-of-type(2) {
       padding-left: unset !important;
       padding-left: unset !important;
@@ -67,13 +64,6 @@
     }
     }
   }
   }
   div[data-testid='Navigation'] {
   div[data-testid='Navigation'] {
-    position: unset;
-
-    top: $navbar-total-height;
-
-    // Adjust to be on top of the growi subnavigation
-    // z-index: $zindex-sticky + 5;
-
     // css-xxx-ContainerNavigationMask
     // css-xxx-ContainerNavigationMask
     > div:nth-of-type(1) {
     > div:nth-of-type(1) {
     }
     }
@@ -146,6 +136,18 @@
 
 
 // Dock Mode
 // Dock Mode
 @mixin dock() {
 @mixin dock() {
+  z-index: $zindex-sticky;
+
+  // override @atlaskit/navigation-next styles
+  $navbar-total-height: $grw-navbar-height + $grw-navbar-border-width;
+  div[data-layout-container='true'] {
+    max-height: calc(100vh - #{$grw-navbar-border-width});
+  }
+  div[data-testid='Navigation'] {
+    position: unset;
+
+    top: $navbar-total-height;
+  }
 }
 }
 
 
 // Drawer Mode
 // Drawer Mode
@@ -153,13 +155,7 @@
   z-index: $zindex-fixed + 1;
   z-index: $zindex-fixed + 1;
 
 
   // override @atlaskit/navigation-next styles
   // override @atlaskit/navigation-next styles
-  div[data-layout-container='true'] {
-    height: 100vw;
-  }
   div[data-testid='Navigation'] {
   div[data-testid='Navigation'] {
-    position: fixed;
-    top: 0;
-
     max-width: 80vw;
     max-width: 80vw;
 
 
     // apply transition
     // apply transition