mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

Merge branch '2.3.0-wip' into 3.0.0-wip

Browse Source 
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/examples/hero.html
	less/buttons.less
	less/carousel.less
	less/close.less
	less/dropdowns.less
	less/labels-badges.less
	less/mixins.less
	less/navbar.less
	less/navs.less
	less/pagination.less
	less/responsive-navbar.less
	less/scaffolding.less
	less/sprites.less
	less/thumbnails.less
	less/type.less
This commit is contained in:
Mark Otto
2013-02-05 19:53:44 -08:00
parent e4a74607b0 c97d304c0c
commit 43da258bd9
16 changed files with 61 additions and 4724 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/navbar.less
+6 -3
View File
@@ -75,7 +75,8 @@
font-weight: 500;
line-height: @line-height-base;
color: @navbar-brand-color;
&:hover {
&:hover,
&:focus {
color: @navbar-brand-color-hover;
text-decoration: none;
background-color: @navbar-brand-bg-hover;
@@ -130,7 +131,8 @@
// Dropdown menu items and carets
.navbar .nav {
// Caret should match text color on hover
li.dropdown > a:hover .caret {
li.dropdown > a:hover .caret,
li.dropdown > a:focus .caret {
border-top-color: @navbar-link-color-hover;
border-bottom-color: @navbar-link-color-hover;
}
@@ -171,7 +173,8 @@
.brand {
color: @navbar-inverse-brand-color;
&:hover {
&:hover,
&:focus {
color: @navbar-inverse-brand-color-hover;
background-color: @navbar-inverse-brand-bg-hover;
}