github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-02-04 19:15:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'accessibility' into 2.1.0-wip

Browse Source 
Conflicts:
	docs/assets/js/bootstrap.min.js
	docs/javascript.html
	docs/templates/pages/javascript.mustache
This commit is contained in:
Jacob Thornton
2012-06-02 16:11:35 -07:00
parent ebc6935663 b1d7c34086
commit 5e5965ca6f
12 changed files with 577 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
less/dropdowns.less
View File

@@ -34,11 +34,16 @@
margin-top: 8px;
margin-left: 2px;
}
.dropdown:hover .caret,
.dropdown a:focus .caret,
.dropdown a:hover .caret,
.open .caret {
.opacity(100);
}
.navbar .nav .open > a {
color: @navbarLinkColorActive;
}
// The dropdown menu (ul)
// ----------------------
.dropdown-menu {
@@ -89,11 +94,13 @@
// Hover state
// -----------
.dropdown-menu li > a:hover,
.dropdown-menu li > a:focus,
.dropdown-menu .active > a,
.dropdown-menu .active > a:hover {
color: @dropdownLinkColorHover;
text-decoration: none;
background-color: @dropdownLinkBackgroundHover;
outline: 0;
}
// Open state for the dropdown

5
less/navbar.less
View File

@@ -222,6 +222,7 @@
padding: ((@navbarHeight - @elementHeight) / 2 - 1) 5px ((@navbarHeight - @elementHeight) / 2);
}
// Hover
.navbar .nav > li > a:focus,
.navbar .nav > li > a:hover {
background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active
color: @navbarLinkColorHover;
@@ -230,7 +231,8 @@
// Active nav items
.navbar .nav .active > a,
.navbar .nav .active > a:hover {
.navbar .nav .active > a:hover,
.navbar .nav .active > a:focus {
color: @navbarLinkColorActive;
text-decoration: none;
background-color: @navbarLinkBackgroundActive;
@@ -337,6 +339,7 @@
}
// Dropdown link on hover
.navbar .nav li.dropdown.active > .dropdown-toggle:focus,
.navbar .nav li.dropdown.active > .dropdown-toggle:hover {
color: @white;
}