mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-07 14:16:47 +02:00
Code Issues Releases Wiki Activity

fixes #4395: scope dropdown menu caret in navbar to first level dropdown only

Browse Source
This commit is contained in:
Mark Otto
2012-08-14 14:29:31 -07:00
parent e9b04acb92
commit 2a6deb92b1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4285,7 +4285,7 @@ input[type="submit"].btn.btn-mini {
margin-top: 3px; margin-top: 3px;
} }
.navbar .dropdown-menu:before { .navbar .nav > li > .dropdown-menu:before {
position: absolute; position: absolute;
top: -7px; top: -7px;
left: 9px; left: 9px;
@@ -4297,7 +4297,7 @@ input[type="submit"].btn.btn-mini {
content: ''; content: '';
} }
.navbar .dropdown-menu:after { .navbar .nav > li > .dropdown-menu:after {
position: absolute; position: absolute;
top: -6px; top: -6px;
left: 10px; left: 10px;
@@ -4308,7 +4308,7 @@ input[type="submit"].btn.btn-mini {
content: ''; content: '';
} }
.navbar-fixed-bottom .dropdown-menu:before { .navbar-fixed-bottom .nav > li > .dropdown-menu:before {
top: auto; top: auto;
bottom: -7px; bottom: -7px;
border-top: 7px solid #ccc; border-top: 7px solid #ccc;
@@ -4316,7 +4316,7 @@ input[type="submit"].btn.btn-mini {
border-top-color: rgba(0, 0, 0, 0.2); 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; top: auto;
bottom: -6px; bottom: -6px;
border-top: 6px solid #ffffff; border-top: 6px solid #ffffff;

4
less/navbar.less
View File

@@ -266,7 +266,7 @@
// -------------- // --------------
// Menu position and menu carets // Menu position and menu carets
.navbar .dropdown-menu { .navbar .nav > li > .dropdown-menu {
&:before { &:before {
content: ''; content: '';
display: inline-block; display: inline-block;
@@ -290,7 +290,7 @@
} }
} }
// Menu position and menu caret support for dropups via extra dropup class // 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 { &:before {
border-top: 7px solid #ccc; border-top: 7px solid #ccc;
border-top-color: @dropdownBorder; border-top-color: @dropdownBorder;