aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-19 14:53:07 -0800
committerMark Otto <[email protected]>2012-02-19 14:53:07 -0800
commit16d12396d0f1f352280ae195ac60a15e7e95d666 (patch)
tree9f578c65f2f246a75b711663930ac0459b096ecc /docs
parent1948e985a355c519b8f3940af0ce83d9fd3c5f83 (diff)
downloadbootstrap-16d12396d0f1f352280ae195ac60a15e7e95d666.tar.xz
bootstrap-16d12396d0f1f352280ae195ac60a15e7e95d666.zip
simplify text color in navbar by placing the color on global .navbar component
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin53361 -> 53366 bytes
-rw-r--r--docs/assets/css/bootstrap.css8
-rw-r--r--docs/templates/pages/javascript.mustache2
3 files changed, 4 insertions, 6 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index b10d1d3c6..fcf656217 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files 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>