Просмотр исходного кода

Loosely fix responsiveness of header

James Allen 12 лет назад
Родитель
Сommit
753a7609e3

+ 8 - 21
services/web/public/stylesheets/components/navbar.less

@@ -152,10 +152,10 @@
 
 .navbar-brand {
   float: left;
-  padding: @navbar-padding-vertical @navbar-padding-horizontal;
-  font-size: @font-size-large;
+  //padding: @navbar-padding-vertical @navbar-padding-horizontal;
+  //font-size: @font-size-large;
   line-height: @line-height-computed;
-  height: @navbar-height;
+  //height: @navbar-height;
 
   &:hover,
   &:focus {
@@ -180,11 +180,10 @@
   position: relative;
   float: right;
   margin-right: @navbar-padding-horizontal;
-  padding: 9px 10px;
   .navbar-vertical-align(34px);
   background-color: transparent;
   background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
-  border: 1px solid transparent;
+  border: 2px solid @navbar-default-link-color;
   border-radius: @border-radius-base;
 
   // We remove the `outline` here, but later compensate by attaching `:hover`
@@ -193,17 +192,6 @@
     outline: none;
   }
 
-  // Bars
-  .icon-bar {
-    display: block;
-    width: 22px;
-    height: 2px;
-    border-radius: 1px;
-  }
-  .icon-bar + .icon-bar {
-    margin-top: 4px;
-  }
-
   @media (min-width: @grid-float-breakpoint) {
     display: none;
   }
@@ -379,7 +367,6 @@
 .navbar-default {
   background-color: @navbar-default-bg;
   border-color: @navbar-default-border;
-  height: 73px;
   padding: 1rem 2rem;
 
   .navbar-brand {
@@ -399,7 +386,7 @@
     > li > a {
       color: @navbar-default-link-color;
       border: 2px solid @navbar-default-link-color;
-      border-radius: 3px;
+      border-radius: @border-radius-base;
       font-size: @font-size-base * .8;
       font-weight: 700;
       line-height: 1;
@@ -433,12 +420,12 @@
 
   .navbar-toggle {
     border-color: @navbar-default-toggle-border-color;
+    color: @navbar-default-link-color;
     &:hover,
     &:focus {
       background-color: @navbar-default-toggle-hover-bg;
-    }
-    .icon-bar {
-      background-color: @navbar-default-toggle-icon-bar-bg;
+      border-color: @navbar-default-toggle-hover-bg;
+      color: #fff;
     }
   }
 

+ 5 - 6
services/web/public/stylesheets/core/variables.less

@@ -105,9 +105,9 @@
 @line-height-large:         1.33;
 @line-height-small:         1.5;
 
-@border-radius-base:        4px;
-@border-radius-large:       6px;
-@border-radius-small:       3px;
+@border-radius-base:        3px;
+@border-radius-large:       5px;
+@border-radius-small:       2px;
 
 //** Global color for active items (e.g., navs or dropdowns).
 @component-active-color:    #fff;
@@ -362,9 +362,8 @@
 @navbar-default-brand-hover-bg:            transparent;
 
 // Navbar toggle
-@navbar-default-toggle-hover-bg:           #ddd;
-@navbar-default-toggle-icon-bar-bg:        #888;
-@navbar-default-toggle-border-color:       #ddd;
+@navbar-default-toggle-hover-bg:           @link-hover-color;
+@navbar-default-toggle-border-color:       @link-color;
 
 //== Navs
 //