diff options
| author | Mark Otto <[email protected]> | 2012-10-01 23:41:00 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-10-01 23:41:00 -0700 |
| commit | 4ab7b77aa3750ffb64bfc544850c2722053ebbda (patch) | |
| tree | d5a71ca6a28de913596766c8df97d3ec2c92d353 /less/dropdowns.less | |
| parent | e6d6c7a413d69afc41c3c57b72f1b0dedfdbb516 (diff) | |
| parent | 7c9597f4e76d45571fab7a0e19d90b2fea8aab02 (diff) | |
| download | bootstrap-4ab7b77aa3750ffb64bfc544850c2722053ebbda.tar.xz bootstrap-4ab7b77aa3750ffb64bfc544850c2722053ebbda.zip | |
Merge branch '2.1.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/labels-badges.less
less/navbar.less
less/tables.less
Diffstat (limited to 'less/dropdowns.less')
| -rw-r--r-- | less/dropdowns.less | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/less/dropdowns.less b/less/dropdowns.less index e0baf42cb..bff96a981 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -151,7 +151,6 @@ .dropdown-submenu { position: relative; } - // Default dropdowns .dropdown-submenu > .dropdown-menu { top: 0; @@ -195,6 +194,21 @@ border-left-color: @dropdownLinkColorHover; } +// Left aligned submenus +.dropdown-submenu.pull-left { + // Undo the float + // Yes, this is awkward since .pull-left adds a float, but it sticks to our conventions elsewhere. + float: none; + + // Positioning the submenu + > .dropdown-menu { + left: -100%; + margin-left: 10px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; + } +} // Tweak nav headers // ----------------- |