rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-03 15:24:19 +01:00
Code Issues Actions Packages Releases Activity

introduce .navbar-link to resolve issue with buttons in .navbar-text

Browse Source
This commit is contained in:
Mark Otto 2012-03-25 01:21:47 -07:00
parent a7b8e52f8e
commit 6c5c29ada2
4 changed files with 14 additions and 1 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.

6
docs/assets/css/bootstrap.css vendored
View File

@ -2896,6 +2896,12 @@ input[type="submit"].btn.btn-mini {
margin-bottom: 0; margin-bottom: 0;
line-height: 40px; line-height: 40px;
} }
.navbar .navbar-link {
color: #999999;
}
.navbar .navbar-link:hover {
color: #ffffff;
}
.navbar .btn, .navbar .btn,
.navbar .btn-group { .navbar .btn-group {
margin-top: 5px; margin-top: 5px;

2
docs/examples/fluid.html
View File

@ -50,7 +50,7 @@
<li><a href="#about">About</a></li> <li><a href="#about">About</a></li>
<li><a href="#contact">Contact</a></li> <li><a href="#contact">Contact</a></li>
</ul> </ul>
<p class="navbar-text pull-right">Logged in as <a href="#">username</a></p> <p class="navbar-text pull-right">Logged in as <a class="navbar-link" href="#">username</a></p>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
</div> </div>

7
less/navbar.less
View File

@ -81,6 +81,13 @@
margin-bottom: 0; margin-bottom: 0;
line-height: @navbarHeight; line-height: @navbarHeight;
} }
// Janky solution for now to account for links outside the .nav
.navbar-link {
color: @navbarLinkColor;
&:hover {
color: @navbarLinkColorHover;
}
}
// Buttons in navbar // Buttons in navbar
.btn, .btn,
.btn-group { .btn-group {