0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00

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
This commit is contained in:
Mark Otto 2013-05-12 15:47:18 -07:00
parent 184018837b
commit 92adcfabb5
3 changed files with 27 additions and 29 deletions

View File

@ -2693,13 +2693,7 @@ input[type="button"].btn-block {
content: "\e160";
}
.dropup,
.dropdown {
position: relative;
}
.dropdown-toggle:active,
.open .dropdown-toggle {
.open > a {
outline: 0;
}
@ -2707,18 +2701,15 @@ input[type="button"].btn-block {
display: inline-block;
width: 0;
height: 0;
vertical-align: top;
margin-top: 8px;
margin-left: 2px;
vertical-align: middle;
border-top: 4px solid #000;
border-right: 4px solid transparent;
border-left: 4px solid transparent;
content: "";
}
.dropdown .caret {
margin-top: 8px;
margin-left: 2px;
}
.dropdown-menu {
position: absolute;
top: 100%;
@ -3140,6 +3131,7 @@ button.close {
}
.nav > li {
position: relative;
display: block;
}
@ -3320,6 +3312,11 @@ button.close {
display: block;
}
.nav-tabs .dropdown-menu {
border-top-right-radius: 0;
border-top-left-radius: 0;
}
/*
// Prevent IE8 from misplacing imgs
// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989

View File

@ -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 {

View File

@ -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