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

mdo · mdo · commit 3e00c1261fa3 · 2012-02-12T20:28:22.000-08:00
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@`
`81`	`81`	`margin-top: 5px; // make buttons vertically centered in navbar`
`82`	`82`	`}`
`83`	`83`	`.btn-group .btn {`
`84`		`- margin-top: 0;`
	`84`	`+ margin-top: 0; // then undo the margin here so we don't accidentally double it`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
`@@ -104,6 +104,14 @@`
`104`	`104`	`input[type="radio"] {`
`105`	`105`	`margin-top: 3px;`
`106`	`106`	`}`
	`107`	`+ .input-append,`
	`108`	`+ .input-prepend {`
	`109`	`+ margin-top: 6px;`
	`110`	`+ white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left`
	`111`	`+ input {`
	`112`	`+ margin-top: 0; // remove the margin on top since it's on the parent`
	`113`	`+ }`
	`114`	`+ }`
`107`	`115`	`}`
`108`	`116`
`109`	`117`	`// Navbar search`