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/navs.less
+10 -5
View File
@@ -21,7 +21,8 @@
display: block;
padding: 10px 15px;
}
.nav > li > a:hover {
.nav > li > a:hover,
.nav > li > a:focus {
text-decoration: none;
background-color: @grayLighter;
}
@@ -61,7 +62,8 @@
}
// Active state, and it's :hover to override normal :hover
.nav-tabs > .active > a,
.nav-tabs > .active > a:hover {
.nav-tabs > .active > a:hover,
.nav-tabs > .active > a:focus {
color: @gray;
background-color: @body-background;
border: 1px solid #ddd;
@@ -86,7 +88,8 @@
// Active state
.nav-pills > .active > a,
.nav-pills > .active > a:hover {
.nav-pills > .active > a:hover,
.nav-pills > .active > a:focus {
color: #fff;
background-color: @link-color;
}
@@ -130,7 +133,8 @@
border-bottom-right-radius: @border-radius-base;
}
.nav-list > .active > a,
.nav-list > .active > a:hover {
.nav-list > .active > a:hover,
.nav-list > .active > a:focus {
z-index: 2; // Bring active item forward so border sits on top of next element
color: #fff;
background-color: @link-color;
@@ -150,7 +154,8 @@
color: @grayLight;
}
// Nuke hover effects
.nav > .disabled > a:hover {
.nav > .disabled > a:hover,
.nav > .disabled > a:focus {
text-decoration: none;
background-color: transparent;
cursor: default;