mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-27 15:19:52 +02:00
Code Issues Releases Wiki Activity

Merge branch 'blakeembrey-dropdown-selectors' into 2.3.0-wip

Browse Source
This commit is contained in:
Mark Otto
2012-12-20 01:34:19 -08:00
parent 3f493f0d0d 0a1434b23b
commit 30d8eb3ed5
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2911,7 +2911,7 @@ table th[class*="span"],
border-bottom: 1px solid #ffffff;
}
.dropdown-menu li > a {
.dropdown-menu > li > a {
display: block;
padding: 3px 20px;
clear: both;
@@ -2921,8 +2921,8 @@ table th[class*="span"],
white-space: nowrap;
}
.dropdown-menu li > a:hover,
.dropdown-menu li > a:focus,
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus,
.dropdown-submenu:hover > a {
color: #ffffff;
text-decoration: none;
@@ -2936,8 +2936,8 @@ table th[class*="span"],
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
}
.dropdown-menu .active > a,
.dropdown-menu .active > a:hover {
.dropdown-menu > .active > a,
.dropdown-menu > .active > a:hover {
color: #ffffff;
text-decoration: none;
background-color: #0081c2;
@@ -2951,12 +2951,12 @@ table th[class*="span"],
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
}
.dropdown-menu .disabled > a,
.dropdown-menu .disabled > a:hover {
.dropdown-menu > .disabled > a,
.dropdown-menu > .disabled > a:hover {
color: #999999;
}
.dropdown-menu .disabled > a:hover {
.dropdown-menu > .disabled > a:hover {
text-decoration: none;
cursor: default;
background-color: transparent;