aboutsummaryrefslogtreecommitdiff
path: root/less/dropdowns.less
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-06-01 10:53:47 -0700
committerJacob Thornton <[email protected]>2012-06-01 10:53:47 -0700
commit5657ab46c5351d5a5718eff3e8f7acf5cb43f752 (patch)
treeef81c0025662070b5a0e265f5c30155189f74e6f /less/dropdowns.less
parenta85c8fe74e2bea9c99ad405dd667035b5307e31e (diff)
parent4eaeea81fd909e6711f57049fc4372f4045fa5aa (diff)
downloadbootstrap-5657ab46c5351d5a5718eff3e8f7acf5cb43f752.tar.xz
bootstrap-5657ab46c5351d5a5718eff3e8f7acf5cb43f752.zip
Merge branch '2.0.4-wip'
Diffstat (limited to 'less/dropdowns.less')
-rw-r--r--less/dropdowns.less6
1 files changed, 3 insertions, 3 deletions
diff --git a/less/dropdowns.less b/less/dropdowns.less
index 6c60385e5..5e232556a 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -71,7 +71,7 @@
// Dividers (basically an hr) within the dropdown
.divider {
- .nav-divider();
+ .nav-divider(@dropdownDividerTop, @dropdownDividerBottom);
}
// Links within the dropdown menu
@@ -103,14 +103,14 @@
// make the menu appear below buttons that appeared later on the page
*z-index: @zindexDropdown;
- .dropdown-menu {
+ & > .dropdown-menu {
display: block;
}
}
// Right aligned dropdowns
// ---------------------------
-.pull-right .dropdown-menu {
+.pull-right > .dropdown-menu {
right: 0;
left: auto;
}