aboutsummaryrefslogtreecommitdiff
path: root/docs/assets
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-12-20 01:34:19 -0800
committerMark Otto <[email protected]>2012-12-20 01:34:19 -0800
commit30d8eb3ed572f2a91c0d4de1326779dec88cd911 (patch)
tree52ae04e835484b334acb689a3166614f66621e6d /docs/assets
parent3f493f0d0d81d21c3d6aa6ffac7e881ca00654e6 (diff)
parent0a1434b23b32fb90098da181d75dcc7b420f96a9 (diff)
downloadbootstrap-30d8eb3ed572f2a91c0d4de1326779dec88cd911.tar.xz
bootstrap-30d8eb3ed572f2a91c0d4de1326779dec88cd911.zip
Merge branch 'blakeembrey-dropdown-selectors' into 2.3.0-wip
Diffstat (limited to 'docs/assets')
-rw-r--r--docs/assets/css/bootstrap.css16
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 3c5d69f37..5b9b4b34a 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -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;