simplify text color in navbar by placing the color on global .navbar component

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index b10d1d3c61720a9bbf357aa531e17309903148b1..fcf65621709fd66653dcd9950fbec8c6db2a05fb 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 71ab7a9d4e24a08e9185127812cdfc59b43bb2ee..535f20a51c4165f714f7e3b226bbafd189bcdec2 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2510,6 +2510,9 @@ button.btn.small, input[type="submit"].btn.small {
 .nav-collapse.collapse {
   height: auto;
 }
+.navbar {
+  color: #999999;
+}
 .navbar .brand:hover {
   text-decoration: none;
 }
@@ -2526,11 +2529,6 @@ button.btn.small, input[type="submit"].btn.small {
 .navbar .navbar-text {
   margin-bottom: 0;
   line-height: 40px;
-  color: #999999;
-}
-.navbar .navbar-text a:hover {
-  color: #ffffff;
-  background-color: transparent;
 }
 .navbar .btn, .navbar .btn-group {
   margin-top: 5px;

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index ac989f3ed7cab83812914fecf15d9cc57651b5bf..69230aa3c8437747ac8d75ea2fa175d373ea3359 100644 (file)
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1244,7 +1244,7 @@ $('#myCollapsible').on('hidden', function () {
           <h4>.carousel({{_i}}options{{/i}})</h4>
           <p>{{_i}}Initializes the carousel with an optional options <code>object</code> and starts cycling through items.{{/i}}</p>
 <pre class="prettyprint linenums">
-$('.myCarousel').carousel({
+$('.carousel').carousel({
   interval: 2000
 })
 </pre>

diff --git a/less/navbar.less b/less/navbar.less
index b656cba48cbeaae16290f80fdd96e0c8d51962c9..62cde1bd17ca0855d6a0d7c65a1d5cef9970afcf 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -50,6 +50,7 @@
 
 // Brand, links, text, and buttons
 .navbar {
+  color: @navbarText;
   // Hover and active states
   .brand:hover {
     text-decoration: none;
@@ -69,11 +70,6 @@
   .navbar-text {
     margin-bottom: 0;
     line-height: 40px;
-    color: @navbarText;
-    a:hover {
-      color: @white;
-      background-color: transparent;
-    }
   }
   // Buttons in navbar
   .btn,