Kaynağa Gözat

Merge pull request #1819 from weseek/support/adjust-nav-bar-for-kibela

Support/adjust nav bar for kibela
Yuki Takei 6 yıl önce
ebeveyn
işleme
a6772252c9

+ 0 - 7
src/client/styles/scss/_navbar.scss

@@ -12,13 +12,6 @@
     content: none;
   }
 
-  .search-top {
-    button {
-      background: transparent;
-      border: none;
-    }
-  }
-
   .nav-link {
     &:hover {
       background: rgba(0, 0, 0, 0.1);

+ 15 - 54
src/client/styles/scss/_navbar_kibela.scss

@@ -1,28 +1,25 @@
 /* navbar */
 
 .kibela {
-  .navbar-header {
-    display: inline-block;
-    min-width: 320px;
+  .grw-navbar {
     height: 60px;
-    padding: 5px 8px 5px 8px;
-    overflow: visible;
-    color: #3c4a60;
     background: white;
     border-bottom: solid 1px #e6e9ec;
-    .navbar-right {
-      a {
+    .navbar-nav {
+      .confidential {
+        color: white;
+        background: #0d3e75;
+      }
+      & > li > a {
+        height: 40px !important;
         margin-right: 1.5em;
+        color: #3c4a60;
+        border-radius: 0.35em;
+        &:hover {
+          color: #3c4a60;
+        }
       }
     }
-    .logo {
-      background: white;
-    }
-    .navbar-top-links > li > a {
-      height: 40px !important;
-      color: #3c4a60;
-      border-radius: 0.35em;
-    }
     .create-page {
       width: 8em;
       text-align: center;
@@ -36,48 +33,12 @@
         color: white;
       }
     }
-    .dropdown {
-      a {
-        .user-name {
-          margin-right: 0.5em;
-          margin-left: 0.5em;
-        }
-      }
-      .img-circle {
-        width: 36px;
-        height: 36px;
-      }
-    }
     @media screen and (max-width: 790px) {
-      .search-top,
-      .navbar-toggle {
+      .search-top {
         display: none !important;
       }
       @media screen and (max-width: 540px) {
-        .user-name {
-          display: none;
-        }
-        .navbar-right {
-          width: 80%;
-          li {
-            width: 25%;
-            text-align: center;
-            a {
-              margin-right: 0px;
-            }
-            .create-page {
-              width: 100%;
-            }
-            .dropdown {
-              text-align: center;
-              .dropdown-toggle {
-                width: 100%;
-                padding-left: 0em;
-                margin-right: 0px;
-              }
-            }
-          }
-        }
+        // TODO responsive after implementation of Sidebar
       }
     }
   }

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

@@ -104,7 +104,7 @@
 
         {% if user %}
         <li class="nav-item">
-          <a class="nav-link" href="#" data-target="#create-page" data-toggle="modal">
+          <a class="nav-link create-page" href="#" data-target="#create-page" data-toggle="modal">
             <i class="icon-pencil mr-2"></i>
             <span class="d-none d-md-inline-block">{{ t('New') }}</span>
           </a>