kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

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

Browse source
This commit is contained in:
Mark Otto 2012-02-19 14:53:07 -08:00
parent 1948e985a3
commit 16d12396d0
4 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View file

Binary file not shown.

8
docs/assets/css/bootstrap.css vendored
View file

@ -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;

2
docs/templates/pages/javascript.mustache vendored
View file

@ -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>

6
less/navbar.less
View file

@ -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,