Fix floats in navbar

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 016c320e1d6d2f437f1a43688a9a16336e1c2d73..151c3dd02c2ddfbfd73aef8976ac3eac17ea2e40 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3046,6 +3046,7 @@ button.close {
     margin-left: -15px;
   }
   .navbar .nav {
+    float: left;
     margin-top: 0;
   }
   .navbar .nav:before,
@@ -3056,6 +3057,9 @@ button.close {
   .navbar .nav:after {
     clear: both;
   }
+  .navbar .nav.pull-right {
+    float: right;
+  }
   .navbar .nav > li {
     float: left;
   }
@@ -3063,7 +3067,6 @@ button.close {
     display: none;
   }
   .nav-collapse.collapse {
-    float: left;
     height: auto !important;
     overflow: visible !important;
   }

diff --git a/less/navbar.less b/less/navbar.less
index c879e9d465d90d9a495d4b153c7a7a7d62a90b4f..be2073fa2e67f9a9161ad9cf22bea0013d4a8dad 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -76,8 +76,8 @@
     background-color: @navbar-link-bg-active;
   }
 }
-@media screen and (min-width: 768px) {
 
+@media screen and (min-width: 768px) {
   .navbar {
     padding-top: 0;
     padding-bottom: 0;
@@ -89,8 +89,13 @@
     margin-left: -15px;
   }
   .navbar .nav {
-    .clear_float();
+    float: left;
     margin-top: 0; // undo top margin to make nav extend full height of navbar
+    .clear_float();
+
+    &.pull-right {
+      float: right;
+    }
   }
   .navbar .nav > li {
     float: left;
@@ -101,11 +106,9 @@
     display: none;
   }
   .nav-collapse.collapse {
-    float: left;
     height: auto !important;
     overflow: visible !important;
   }
-
 }
 
 // Inverse navbar