itizawa 6 лет назад
Родитель
Сommit
613514b9ca
2 измененных файлов с 10 добавлено и 4 удалено
  1. 9 3
      src/client/styles/scss/_navbar.scss
  2. 1 1
      src/server/views/layout/layout.html

+ 9 - 3
src/client/styles/scss/_navbar.scss

@@ -7,9 +7,15 @@
     padding: 0 1rem;
     padding: 0 1rem;
   }
   }
 
 
-  .personal-dropdown > .dropdown-toggle::after {
-    // hide caret
-    content: none;
+  #personal-dropdown {
+    & > .dropdown-menu {
+      // Adjust to be on top of the growi subnavigation
+      z-index: $zindex-sticky + 10;
+    }
+    &::after {
+      // hide caret
+      content: none;
+    }
   }
   }
 
 
   .nav-link {
   .nav-link {

+ 1 - 1
src/server/views/layout/layout.html

@@ -114,7 +114,7 @@
             <i class="icon-question mr-2"></i><span class="d-none d-md-inline-block mr-2">{{ t('Help') }}</span><span class="text-muted small"><i class="icon-share-alt"></i></span>
             <i class="icon-question mr-2"></i><span class="d-none d-md-inline-block mr-2">{{ t('Help') }}</span><span class="text-muted small"><i class="icon-share-alt"></i></span>
           </a>
           </a>
         </li>
         </li>
-        <li id="personal-dropdown" class="nav-item dropdown"></li>
+        <li id="personal-dropdown" class="nav-item dropdown dropdown-toggle"></li>
         {% else %}
         {% else %}
         <li id="login-user" class="nav-item"><a class="nav-link" href="/login">Login</a></li>
         <li id="login-user" class="nav-item"><a class="nav-link" href="/login">Login</a></li>
         {% endif %}
         {% endif %}