From 16d12396d0f1f352280ae195ac60a15e7e95d666 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 19 Feb 2012 14:53:07 -0800
Subject: simplify text color in navbar by placing the color on global .navbar
 component

---
 docs/assets/bootstrap.zip                | Bin 53361 -> 53366 bytes
 docs/assets/css/bootstrap.css            |   8 +++-----
 docs/templates/pages/javascript.mustache |   2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index b10d1d3c6..fcf656217 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 71ab7a9d4..535f20a51 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 ac989f3ed..69230aa3c 100644
--- 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>
-- 
cgit v1.2.3