allow .input-prepend/.input-append to work in .navbar per #1681

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 15db21f3cf3de83e9bba46858244483c5ba521d8..62f900de975ea347a8e606c6218070185575c961 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 61e67360c476483e813b6a24acab2de0854b9a58..38b1719de9751306819be036cc2d7fe141ce989a 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2530,6 +2530,13 @@ button.btn.small, input[type="submit"].btn.small {
 .navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] {
   margin-top: 3px;
 }
+.navbar-form .input-append, .navbar-form .input-prepend {
+  margin-top: 6px;
+  white-space: nowrap;
+}
+.navbar-form .input-append input, .navbar-form .input-prepend input {
+  margin-top: 0;
+}
 .navbar-search {
   position: relative;
   float: left;

diff --git a/less/navbar.less b/less/navbar.less
index 35c209fc4a6a535eca539c12dc84ae6e55897bd0..16553c1ff320cc1fa70a2d3278fb40d4a501f68a 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -81,7 +81,7 @@
     margin-top: 5px; // make buttons vertically centered in navbar
   }
   .btn-group .btn {
-    margin-top: 0;
+    margin-top: 0; // then undo the margin here so we don't accidentally double it
   }
 }
 
@@ -104,6 +104,14 @@
   input[type="radio"] {
     margin-top: 3px;
   }
+  .input-append,
+  .input-prepend {
+    margin-top: 6px;
+    white-space: nowrap; // preven two  items from separating within a .navbar-form that has .pull-left
+    input {
+      margin-top: 0; // remove the margin on top since it's on the parent
+    }
+  }
 }
 
 // Navbar search