fix navbar form alignment, and update examples to show these cases

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 9cabb3687b95d16ec0d18a849b912b710faf6bbd..f407a5db31a54cb9ea0fcf3230805199be8b32e1 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4018,7 +4018,7 @@ input[type="submit"].btn.btn-mini {
 .navbar .brand {
   display: block;
   float: left;
-  padding: 10px 20px 10px;
+  padding: 8px 20px 12px;
   margin-left: -20px;
   font-size: 20px;
   font-weight: 200;
@@ -4072,7 +4072,7 @@ input[type="submit"].btn.btn-mini {
 .navbar-form select,
 .navbar-form .radio,
 .navbar-form .checkbox {
-  margin-top: 6px;
+  margin-top: 5px;
 }
 
 .navbar-form input,

diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html
index e39ea8b1a9cfd8235fbd790db0ae8f9110f175be..24ea26582f80530aac76fddf460ece5451240ac7 100644 (file)
--- a/docs/examples/fluid.html
+++ b/docs/examples/fluid.html
@@ -44,18 +44,10 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="#">Project name</a>
-          <div class="btn-group pull-right">
-            <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-              <i class="icon-user"></i> Username
-              <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu">
-              <li><a href="#">Profile</a></li>
-              <li class="divider"></li>
-              <li><a href="#">Sign Out</a></li>
-            </ul>
-          </div>
           <div class="nav-collapse collapse">
+            <p class="navbar-text pull-right">
+              Logged in as <a href="#" class="navbar-link">Username</a>
+            </p>
             <ul class="nav">
               <li class="active"><a href="#">Home</a></li>
               <li><a href="#about">About</a></li>

diff --git a/docs/examples/hero.html b/docs/examples/hero.html
index 32f6561bdeb7f408caad12750659eb872cb21615..3efe568eb84803a912eef6bc2d2289accb1086c4 100644 (file)
--- a/docs/examples/hero.html
+++ b/docs/examples/hero.html
@@ -47,6 +47,11 @@
               <li><a href="#about">About</a></li>
               <li><a href="#contact">Contact</a></li>
             </ul>
+            <form class="navbar-form pull-right">
+              <input class="span2" type="text" placeholder="Email">
+              <input class="span2" type="password" placeholder="Password">
+              <button type="submit" class="btn">Sign in</button>
+            </form>
           </div><!--/.nav-collapse -->
         </div>
       </div>

diff --git a/less/navbar.less b/less/navbar.less
index 02535a46743f94413abd16894465c2d87aaa5f9d..0e027d2c32a1d4c9ac76e9500cd6cb97ca36823a 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -48,7 +48,8 @@
   display: block;
   // Vertically center the text given @navbarHeight
   @elementHeight: 20px;
-  padding: ((@navbarHeight - @elementHeight) / 2) 20px ((@navbarHeight - @elementHeight) / 2);
+  @heightDifference: @navbarHeight - @elementHeight;
+  padding: ((@heightDifference / 2) - 2) 20px ((@heightDifference / 2) + 2);
   margin-left: -20px; // negative indent to left-align the text down the page
   font-size: 20px;
   font-weight: 200;
@@ -93,7 +94,7 @@
   select,
   .radio,
   .checkbox {
-    .navbarVerticalAlign(28px); // Vertically center in navbar
+    .navbarVerticalAlign(30px); // Vertically center in navbar
   }
   input,
   select,

diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index 81d5b189654e44a99a6b9931b34e7de13a61a4f5..a8f62c3ccf9bb6d767a5efe0915f769b49ad4a75 100644 (file)
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -34,7 +34,7 @@
 
   <!-- Navbar
     ================================================== -->
-    <div class="navbar navbar-fixed-top">
+    <div class="navbar navbar-inverse navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="../../docs/index.html">Bootstrap</a>
@@ -53,7 +53,9 @@
 </header>
 
 
-<div class="container">
+<div class="bs-docs-canvas">
+
+  <div class="container">
 
 
 
@@ -1096,6 +1098,7 @@
       </div>
     </footer>
 
+</div>
 
 
     <!-- Le javascript