]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
account for floated inputs in the .navbar-form
authorMark Otto <markdotto@gmail.com>
Mon, 30 Jan 2012 16:20:37 +0000 (08:20 -0800)
committerMark Otto <markdotto@gmail.com>
Mon, 30 Jan 2012 16:20:37 +0000 (08:20 -0800)
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
less/navbar.less

index 78d7f57a421f46be5d2c8f08e85289ac2ebe2d13..2a4e8934ec956247d61154b92c3a3a62b11f32cb 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
index 7d987a56ccb3853ca4b1c1c11e12605988a72b43..2caba5f4d3eb9fc0ffbd5b7ed6e8ae734294176b 100644 (file)
@@ -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;
index ccfbb69459b465b852eca5c4897daef706148e11..eb19a2b070a30adbbb4aa8276d32530630fb8e9a 100644 (file)
@@ -88,6 +88,7 @@
 // Navbar forms
 .navbar-form {
   margin-bottom: 0; // remove default bottom margin
+  .clearfix();
   input,
   select {
     display: inline-block;