add navbarheight support to .brand and .nav links in navbar

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 69849219e82ab166703c10544a9139ffc673888c..582dc534822d1fbb89971e4340ae430ba7e70886 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b4d9d80c6b9f2213994f3411eb574bc76df873d5..1c80a05d7a139451f339d28b2eb9e249846ce53a 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2804,6 +2804,7 @@ input[type="submit"].btn.btn-mini {
   margin-bottom: 18px;
 }
 .navbar-inner {
+  height: 40px;
   padding-left: 20px;
   padding-right: 20px;
   background-color: #2c2c2c;
@@ -3030,7 +3031,7 @@ input[type="submit"].btn.btn-mini {
 }
 .navbar .nav > li > a {
   float: none;
-  padding: 10px 10px 11px;
+  padding: 9px 10px 11px;
   line-height: 19px;
   color: #999999;
   text-decoration: none;

diff --git a/less/navbar.less b/less/navbar.less
index 297676f4909d2469dde93ef5644cf1a7f51a9bc3..711e67f7add0c21927543491cb63df0788d844cb 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -16,6 +16,7 @@
 
 // Gradient is applied to it's own element because overflow visible is not honored by IE when filter is present
 .navbar-inner {
+  height: @navbarHeight;
   padding-left:  20px;
   padding-right: 20px;
   #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
@@ -69,7 +70,10 @@
   .brand {
     float: left;
     display: block;
-    padding: 8px 20px 12px;
+    // Vertically center the text given @navbarHeight
+    @elementHeight: 20px;
+    padding: ((@navbarHeight - @elementHeight) / 2 - 2) 20px ((@navbarHeight - @elementHeight) / 2 + 2);
+
     margin-left: -20px; // negative indent to left-align the text down the page
     font-size: 20px;
     font-weight: 200;
@@ -225,7 +229,9 @@
 // Links
 .navbar .nav > li > a {
   float: none;
-  padding: 10px 10px 11px;
+  // Vertically center the text given @navbarHeight
+  @elementHeight: 20px;
+  padding: ((@navbarHeight - @elementHeight) / 2 - 1) 10px ((@navbarHeight - @elementHeight) / 2 + 1);
   line-height: 19px;
   color: @navbarLinkColor;
   text-decoration: none;