lighter default navbar, add borders to navbars, tweak padding and alignments

2 files changed, 18 insertions, 6 deletions

diff --git a/less/navbar.less b/less/navbar.less
index 71eacfb93..f23598fc0 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -13,6 +13,7 @@
   min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
   margin-bottom: @navbar-margin-bottom;
   background-color: @navbar-bg;
+  border: 1px solid @navbar-border;
 
   // Prevent floats from breaking the navbar
   .clearfix();
@@ -50,8 +51,7 @@
 // content for the user's viewport.
 
 .navbar-collapse {
-  padding-top: 5px;
-  padding-bottom: 5px;
+  padding: 5px @navbar-padding-horizontal;
   border-top: 1px solid darken(@navbar-bg, 7%);
   box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
   // Clear floated elements and prevent collapsing of padding
@@ -82,6 +82,7 @@
 // Static top (unfixed, but 100% wide) navbar
 .navbar-static-top {
   @media (min-width: @grid-float-breakpoint) {
+    border-width: 0 0 1px;
     border-radius: 0;
   }
 }
@@ -93,6 +94,7 @@
   right: 0;
   left: 0;
   z-index: @zindex-navbar-fixed;
+  border-width: 0 0 1px;
 
   // Undo the rounded corners
   @media (min-width: @grid-float-breakpoint) {
@@ -166,6 +168,14 @@
 // the nav the full height of the horizontal nav (above 768px).
 
 .navbar-nav {
+  margin-left: -@navbar-padding-horizontal;
+  margin-right: -@navbar-padding-horizontal;
+
+  @media (min-width: @grid-float-breakpoint) {
+    margin-left: 0;
+    margin-right: 0;
+  }
+
   > li > a {
     padding-top:    10px;
     padding-bottom: 10px;
@@ -333,6 +343,7 @@
 
 .navbar-inverse {
   background-color: @navbar-inverse-bg;
+  border-color: @navbar-inverse-border;
 
   .navbar-brand {
     color: @navbar-inverse-brand-color;
@@ -513,7 +524,6 @@
 
 .navbar-text {
   float: left;
-  padding: 0 @navbar-padding-horizontal;
   .navbar-vertical-align(@line-height-computed);
 }
 
diff --git a/less/variables.less b/less/variables.less
index 4bdf54905..089f4fb19 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -231,9 +231,10 @@
 
 // Basics of a navbar
 @navbar-height:                    50px;
-@navbar-color:                     #777;
-@navbar-bg:                        #eee;
 @navbar-margin-bottom:             @line-height-computed;
+@navbar-color:                     #777;
+@navbar-bg:                        #f8f8f8;
+@navbar-border:                    darken(@navbar-bg, 6.5%);
 @navbar-border-radius:             @border-radius-base;
 @navbar-padding-horizontal:        floor(@grid-gutter-width / 2);
 @navbar-padding-vertical:          ((@navbar-height - @line-height-computed) / 2);
@@ -243,7 +244,7 @@
 @navbar-link-hover-color:          #333;
 @navbar-link-hover-bg:             transparent;
 @navbar-link-active-color:         #555;
-@navbar-link-active-bg:            darken(@navbar-bg, 10%);
+@navbar-link-active-bg:            darken(@navbar-bg, 6.5%);
 @navbar-link-disabled-color:       #ccc;
 @navbar-link-disabled-bg:          transparent;
 
@@ -263,6 +264,7 @@
 // Reset inverted navbar basics
 @navbar-inverse-color:                      @gray-light;
 @navbar-inverse-bg:                         #222;
+@navbar-inverse-border:                     darken(@navbar-inverse-bg, 10%);
 
 // Inverted navbar links
 @navbar-inverse-link-color:                 @gray-light;