diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index b10d1d3c61..fcf6562170 100644 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 71ab7a9d4e..535f20a51c 100644 --- 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 ac989f3ed7..69230aa3c8 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -1244,7 +1244,7 @@ $('#myCollapsible').on('hidden', function () {

.carousel({{_i}}options{{/i}})

{{_i}}Initializes the carousel with an optional options object and starts cycling through items.{{/i}}

-$('.myCarousel').carousel({
+$('.carousel').carousel({
   interval: 2000
 })
 
diff --git a/less/navbar.less b/less/navbar.less index b656cba48c..62cde1bd17 100644 --- 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,