mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Code Activity

fix dropdowns for active state in dropdown menus

Browse Source
This commit is contained in:
Mark Otto
2012-01-08 15:33:44 -08:00
parent ac68bc39ff
commit 4b79443bba
4 changed files with 62 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap.css
Vendored
+18 -5
View File
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Sun Jan 8 14:33:06 PST 2012
* Date: Sun Jan 8 15:33:29 PST 2012
*/
html, body {
margin: 0;
@@ -1493,7 +1493,7 @@ i {
line-height: 18px;
color: #555555;
}
.dropdown-menu a:hover, .dropdown-menu .active > a {
.dropdown-menu li > a:hover {
color: #fff;
text-decoration: none;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
@@ -1511,6 +1511,11 @@ i {
-moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075);
}
.dropdown-menu .active > a, .dropdown-menu .active > a:hover {
color: #fff;
background-color: #999;
background-image: none;
}
.dropdown.open .dropdown-toggle {
color: #ffffff;
background: #ccc;
@@ -1870,7 +1875,7 @@ i {
.tabs > li > a:hover {
border-color: #eee #eee #ddd;
}
.tabs .active > a, .tabs .active > a:hover {
.tabs > .active > a, .tabs > .active > a:hover {
color: #555555;
background-color: #ffffff;
border: 1px solid #ddd;
@@ -1941,11 +1946,19 @@ i {
.tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret {
border-top-color: #005580;
}
.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle {
.tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret {
border-top-color: #333;
}
.nav > .dropdown.active > a:hover {
color: #000;
cursor: pointer;
}
.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle, .nav > .open.active > a:hover {
color: #fff;
background-color: #999;
border-color: #999;
}
.nav .open .caret, .nav .open a:hover .caret {
.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret {
border-top-color: #fff;
filter: alpha(opacity=100);
-moz-opacity: 1;