fix #2829: redeclare .pull-right for navs since they get more specific floats

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index b50d5ad015769e26ec18142f7774c12762a643ff..22a565198e970f7fa8229aa4500286f761363ef6 100644 (file)
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 fed56717fcfbac06306cc064b479b3c695549d63..7ed443efb1067feb41e3374b2d050ed39a16a177 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2557,6 +2557,9 @@ input[type="submit"].btn.btn-mini {
   text-decoration: none;
   background-color: #eeeeee;
 }
+.nav > .pull-right {
+  float: right;
+}
 .nav .nav-header {
   display: block;
   padding: 3px 15px;

diff --git a/less/navs.less b/less/navs.less
index 865098c8be5e74ce4faa72f09ec1feb910a059fb..a02be18f0658cdc1ce5e3abcf634e1a9c95d1025 100644 (file)
--- a/less/navs.less
+++ b/less/navs.less
@@ -21,6 +21,11 @@
   background-color: @grayLighter;
 }
 
+// Redeclare pull classes because of specifity
+.nav > .pull-right {
+  float: right;
+}
+
 // Nav headers (for dropdowns and lists)
 .nav .nav-header {
   display: block;