aboutsummaryrefslogtreecommitdiff
path: root/less/dropdowns.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-09-07 22:34:51 -0700
committerMark Otto <[email protected]>2012-09-07 22:34:51 -0700
commit7e2958121028b4fdfcd40f7d03dd3c37ceba6a51 (patch)
treea357929a7f065cfd2ad2498412e224eb2d0df458 /less/dropdowns.less
parentcb46ddee72eb45f835504a625947c821c8f60635 (diff)
parentf29f98501c11678e2ecfe8fd5c842adcd5a40091 (diff)
downloadbootstrap-7e2958121028b4fdfcd40f7d03dd3c37ceba6a51.tar.xz
bootstrap-7e2958121028b4fdfcd40f7d03dd3c37ceba6a51.zip
Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts: docs/scaffolding.html docs/templates/pages/scaffolding.mustache
Diffstat (limited to 'less/dropdowns.less')
-rw-r--r--less/dropdowns.less14
1 files changed, 14 insertions, 0 deletions
diff --git a/less/dropdowns.less b/less/dropdowns.less
index 390c37497..bed158612 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -163,6 +163,8 @@
.dropdown-submenu {
position: relative;
}
+
+// Default dropdowns
.dropdown-submenu > .dropdown-menu {
top: 0;
left: 100%;
@@ -176,6 +178,18 @@
display: block;
}
+// Dropups
+.dropup .dropdown-submenu > .dropdown-menu {
+ top: auto;
+ bottom: 0;
+ margin-top: 0;
+ margin-bottom: -2px;
+ -webkit-border-radius: 5px 5px 5px 0;
+ -moz-border-radius: 5px 5px 5px 0;
+ border-radius: 5px 5px 5px 0;
+}
+
+// Caret to indicate there is a submenu
.dropdown-submenu > a:after {
display: block;
content: " ";