From: Mark Otto <markdotto@gmail.com>
Date: Mon, 30 Jan 2012 16:20:37 +0000 (-0800)
Subject: account for floated inputs in the .navbar-form
X-Git-Tag: v2.0.0~6^2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3722c34b5032e5f1d4f6e8d28260b16ee48af4da;p=thirdparty%2Fbootstrap.git

account for floated inputs in the .navbar-form
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 78d7f57a42..2a4e8934ec 100644
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 7d987a56cc..2caba5f4d3 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2429,6 +2429,14 @@ button.btn.small, input[type="submit"].btn.small {
 }
 .navbar-form {
   margin-bottom: 0;
+  *zoom: 1;
+}
+.navbar-form:before, .navbar-form:after {
+  display: table;
+  content: "";
+}
+.navbar-form:after {
+  clear: both;
 }
 .navbar-form input, .navbar-form select {
   display: inline-block;
diff --git a/less/navbar.less b/less/navbar.less
index ccfbb69459..eb19a2b070 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -88,6 +88,7 @@
 // Navbar forms
 .navbar-form {
   margin-bottom: 0; // remove default bottom margin
+  .clearfix();
   input,
   select {
     display: inline-block;