fixes #4578: add clearfix to .navbar-inner to clear floats

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 2b10e934467e00c783a3ca679031b18789e5936d..09d85da0e96b6ef1128018f5c99e3d6598aa3245 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4113,11 +4113,23 @@ input[type="submit"].btn.btn-mini {
      -moz-border-radius: 4px;
           border-radius: 4px;
   filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+  *zoom: 1;
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
      -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
           box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
 }
 
+.navbar-inner:before,
+.navbar-inner:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.navbar-inner:after {
+  clear: both;
+}
+
 .navbar .container {
   width: auto;
 }

diff --git a/less/navbar.less b/less/navbar.less
index 7b941195cc9fd9191fe67727d0c03433801cb9a0..a1fe00f5137b465a9385df3b949fa1e42ed08a3b 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -27,6 +27,9 @@
   border: 1px solid @navbarBorder;
   .border-radius(4px);
   .box-shadow(0 1px 4px rgba(0,0,0,.065));
+
+  // Prevent floats from breaking the navbar
+  .clearfix();
 }
 
 // Set width to auto for default container