diff options
| author | Mark Otto <[email protected]> | 2013-05-12 15:47:18 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-05-12 15:47:18 -0700 |
| commit | 92adcfabb58cc5a8ce41c34bec0ec36a642e5610 (patch) | |
| tree | bd5dfa17374ce19d76e0729792c3d4b169c8517b /less | |
| parent | 184018837b07c216d8667003ac0bd9958eb07cee (diff) | |
| download | bootstrap-92adcfabb58cc5a8ce41c34bec0ec36a642e5610.tar.xz bootstrap-92adcfabb58cc5a8ce41c34bec0ec36a642e5610.zip | |
Start some nav and dropdown cleanup
* Remove border-radii on top of tab dropdown menus
* Remove the .dropdown and .dropup styles and instead place on all
* Use on dropdown carets intead of separately applying margin with a top alignment
* Some other misc cleanup
Diffstat (limited to 'less')
| -rw-r--r-- | less/dropdowns.less | 19 | ||||
| -rw-r--r-- | less/navs.less | 14 |
2 files changed, 17 insertions, 16 deletions
diff --git a/less/dropdowns.less b/less/dropdowns.less index c4fd8598b..45242fb68 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -2,14 +2,8 @@ // Dropdown menus // -------------------------------------------------- - -// Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns -.dropup, -.dropdown { - position: relative; -} -.dropdown-toggle:active, -.open .dropdown-toggle { +// Remove the outline when :focus is triggered +.open > a { outline: 0; } @@ -19,19 +13,14 @@ display: inline-block; width: 0; height: 0; - vertical-align: top; + margin-left: 2px; + vertical-align: middle; border-top: 4px solid #000; border-right: 4px solid transparent; border-left: 4px solid transparent; content: ""; } -// Place the caret -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; -} - // The dropdown menu (ul) // ---------------------- .dropdown-menu { diff --git a/less/navs.less b/less/navs.less index 649eef92b..7e8bcf87c 100644 --- a/less/navs.less +++ b/less/navs.less @@ -12,8 +12,11 @@ padding-left: 0; // Override default ul/ol list-style: none; .clearfix(); + > li { + position: relative; display: block; + > a { position: relative; display: block; @@ -44,7 +47,7 @@ cursor: default; } // Space the headers out when they follow another list item (link) - &+ .nav-header { + + .nav-header { margin-top: 9px; } } @@ -215,6 +218,15 @@ +// Dropdowns +// ------------------------- + +.nav-tabs .dropdown-menu { + // Remove the top rounded corners here since there is a hard edge above the menu + .border-top-radius(0); +} + + /* // Prevent IE8 from misplacing imgs // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989 |