aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-08-14 14:29:31 -0700
committerMark Otto <[email protected]>2012-08-14 14:29:31 -0700
commit2a6deb92b1786d572ed23347e486043e0df63547 (patch)
treeb58c409ad65c6c8f9c89fa9110bcc9a66c7788d9
parente9b04acb92538718f60b205909c385222406a84f (diff)
downloadbootstrap-2a6deb92b1786d572ed23347e486043e0df63547.tar.xz
bootstrap-2a6deb92b1786d572ed23347e486043e0df63547.zip
fixes #4395: scope dropdown menu caret in navbar to first level dropdown only
-rw-r--r--docs/assets/css/bootstrap.css8
-rw-r--r--less/navbar.less4
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 3fd9070be..c7fbc3e96 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4285,7 +4285,7 @@ input[type="submit"].btn.btn-mini {
margin-top: 3px;
}
-.navbar .dropdown-menu:before {
+.navbar .nav > li > .dropdown-menu:before {
position: absolute;
top: -7px;
left: 9px;
@@ -4297,7 +4297,7 @@ input[type="submit"].btn.btn-mini {
content: '';
}
-.navbar .dropdown-menu:after {
+.navbar .nav > li > .dropdown-menu:after {
position: absolute;
top: -6px;
left: 10px;
@@ -4308,7 +4308,7 @@ input[type="submit"].btn.btn-mini {
content: '';
}
-.navbar-fixed-bottom .dropdown-menu:before {
+.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
top: auto;
bottom: -7px;
border-top: 7px solid #ccc;
@@ -4316,7 +4316,7 @@ input[type="submit"].btn.btn-mini {
border-top-color: rgba(0, 0, 0, 0.2);
}
-.navbar-fixed-bottom .dropdown-menu:after {
+.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
top: auto;
bottom: -6px;
border-top: 6px solid #ffffff;
diff --git a/less/navbar.less b/less/navbar.less
index 4306047c7..423ff4c72 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -266,7 +266,7 @@
// --------------
// Menu position and menu carets
-.navbar .dropdown-menu {
+.navbar .nav > li > .dropdown-menu {
&:before {
content: '';
display: inline-block;
@@ -290,7 +290,7 @@
}
}
// Menu position and menu caret support for dropups via extra dropup class
-.navbar-fixed-bottom .dropdown-menu {
+.navbar-fixed-bottom .nav > li > .dropdown-menu {
&:before {
border-top: 7px solid #ccc;
border-top-color: @dropdownBorder;