aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-22 20:41:52 -0800
committerJacob Thornton <[email protected]>2012-01-22 20:41:52 -0800
commitf7b5e0f6b58ae137cc878a1660f9513e343a74c3 (patch)
treeac4b116b5871254cb1ffe956449caf607ea2590b /lib
parent36d2679f8358f91d8a2c746e0f14b3500b73c163 (diff)
parent87113396dfbf7bfcb41c52702c6d8c861ab215c9 (diff)
downloadbootstrap-f7b5e0f6b58ae137cc878a1660f9513e343a74c3.tar.xz
bootstrap-f7b5e0f6b58ae137cc878a1660f9513e343a74c3.zip
Merge pull request #1046 from kevva/dropdown-menus
Scalable dropdown menus
Diffstat (limited to 'lib')
-rw-r--r--lib/button-groups.less2
-rw-r--r--lib/dropdowns.less2
-rw-r--r--lib/navbar.less2
-rw-r--r--lib/navs.less4
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/button-groups.less b/lib/button-groups.less
index 253469f88..93fbb7f18 100644
--- a/lib/button-groups.less
+++ b/lib/button-groups.less
@@ -88,7 +88,7 @@
// Reposition menu on open and round all corners
.btn-group.open .dropdown-menu {
display: block;
- top: 30px;
+ margin-top: 1px;
.border-radius(5px);
&.large { top: 40px; }
}
diff --git a/lib/dropdowns.less b/lib/dropdowns.less
index 40b4d7e87..e2c32f180 100644
--- a/lib/dropdowns.less
+++ b/lib/dropdowns.less
@@ -30,7 +30,7 @@
// The dropdown menu (ul)
.dropdown-menu {
position: absolute;
- top: 40px;
+ top: 100%;
z-index: @zindexDropdown;
float: left;
display: none; // none by default, but block on "open" of the menu
diff --git a/lib/navbar.less b/lib/navbar.less
index 8064490f7..dba95e5cd 100644
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -191,7 +191,7 @@
// Menu position and menu carets
.navbar .dropdown-menu {
- top: 41px;
+ margin-top: 1px;
.border-radius(4px);
&:before {
content: '';
diff --git a/lib/navs.less b/lib/navs.less
index 4db77af4f..cd356d9bb 100644
--- a/lib/navs.less
+++ b/lib/navs.less
@@ -177,7 +177,7 @@
// Position the menu
.pills .dropdown-menu,
.tabs .dropdown-menu {
- top: 33px;
+ margin-top: 1px;
border-width: 1px;
}
.pills .dropdown-menu {
@@ -239,7 +239,7 @@
// COMMON STYLES
-// -------------
+// -------------
// Clear any floats
.tabbable {