rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00
Code Issues Actions Packages Releases Activity

Consolidate active dropdown toggle styles and comment out the rest

Browse Source
This commit is contained in:
Mark Otto 2013-05-12 16:12:13 -07:00
parent 2d10d61fde
commit 37c1122ded
2 changed files with 72 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
docs/assets/css/bootstrap.css vendored
View File

@ -3165,10 +3165,18 @@ button.close {
.nav > li.open > a, .nav > li.open > a,
.nav > li.open > a:hover, .nav > li.open > a:hover,
.nav > li.open > a:focus { .nav > li.open > a:focus {
color: #fff;
background-color: #428bca; background-color: #428bca;
border-color: #428bca; border-color: #428bca;
} }
.nav > li.open > a .caret,
.nav > li.open > a:hover .caret,
.nav > li.open > a:focus .caret {
border-top-color: #fff;
border-bottom-color: #fff;
}
.nav > .pull-right { .nav > .pull-right {
float: right; float: right;
} }
@ -3318,12 +3326,6 @@ button.close {
display: block; display: block;
} }
.nav-tabs .dropdown-menu {
margin-top: -1px;
border-top-right-radius: 0;
border-top-left-radius: 0;
}
.nav .caret { .nav .caret {
border-top-color: #428bca; border-top-color: #428bca;
border-bottom-color: #428bca; border-bottom-color: #428bca;
@ -3334,90 +3336,47 @@ button.close {
border-bottom-color: #2a6496; border-bottom-color: #2a6496;
} }
/*.nav .active .caret {
border-top-color: #fff;
border-bottom-color: #fff;
}
.nav-tabs .active .caret {
border-top-color: @gray;
border-bottom-color: @gray;
}*/
.nav-tabs .dropdown-menu {
margin-top: -1px;
border-top-right-radius: 0;
border-top-left-radius: 0;
}
/*
// Active dropdown links
// -------------------------
.nav .active .caret { .nav .active .caret {
border-top-color: #fff; border-top-color: #fff;
border-bottom-color: #fff; border-bottom-color: #fff;
} }
.nav-tabs .active .caret { .nav-tabs .active .caret {
border-top-color: #555555;
border-bottom-color: #555555;
}
.nav > .dropdown.active > a:hover {
cursor: pointer;
}
.nav-tabs .open > a,
.nav-pills .open > a,
.nav > li.dropdown.open.active > a:hover {
color: #fff;
background-color: #999999;
border-color: #999999;
}
.nav li.dropdown.open .caret,
.nav li.dropdown.open.active .caret,
.nav li.dropdown.open > a:hover .caret {
border-top-color: #fff;
border-bottom-color: #fff;
opacity: 1;
filter: alpha(opacity=100);
}
.tabs-stacked .open > a:hover {
border-color: #999999;
}
/*
// Prevent IE8 from misplacing imgs
// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
.nav > li > a > img {
max-width: none;
}
// Dropdowns
// -------------------------
.nav-tabs .dropdown-menu {
// Remove the top rounded corners here since there is a hard edge above the menu
.border-top-radius(0);
}
// Default dropdown links
// -------------------------
// Make carets use linkColor to start
.nav .dropdown-toggle .caret {
border-top-color: @link-color;
border-bottom-color: @link-color;
margin-top: 8px;
}
.nav .dropdown-toggle:hover .caret {
border-top-color: @link-hover-color;
border-bottom-color: @link-hover-color;
}
// Active dropdown links
// -------------------------
.nav .active .dropdown-toggle .caret {
border-top-color: #fff;
border-bottom-color: #fff;
}
.nav-tabs .active .dropdown-toggle .caret {
border-top-color: @gray; border-top-color: @gray;
border-bottom-color: @gray; border-bottom-color: @gray;
} }
*/
/*
// Active:hover dropdown links // Active:hover dropdown links
// ------------------------- // -------------------------
.nav > .dropdown.active > a:hover { .nav > .dropdown.active > a:hover {
cursor: pointer; cursor: pointer;
} }
*/
// Open dropdowns /*// Open dropdowns
// ------------------------- // -------------------------
.nav-tabs .open .dropdown-toggle, .nav > .open > a,
.nav-pills .open .dropdown-toggle, .nav-pills .open > a,
.nav > li.dropdown.open.active > a:hover { .nav > li.dropdown.open.active > a:hover {
color: #fff; color: #fff;
background-color: @gray-light; background-color: @gray-light;
@ -3425,18 +3384,16 @@ button.close {
} }
.nav li.dropdown.open .caret, .nav li.dropdown.open .caret,
.nav li.dropdown.open.active .caret, .nav li.dropdown.open.active .caret,
.nav li.dropdown.open a:hover .caret { .nav li.dropdown.open > a:hover .caret {
border-top-color: #fff; border-top-color: #fff;
border-bottom-color: #fff; border-bottom-color: #fff;
.opacity(1); .opacity(1);
} }*/
// Dropdowns in stacked tabs /*// Dropdowns in stacked tabs
.tabs-stacked .open > a:hover { .tabs-stacked .open > a:hover {
border-color: @gray-light; border-color: @gray-light;
} }*/
*/
.navbar { .navbar {
position: relative; position: relative;

124
less/navs.less
View File

@ -49,8 +49,13 @@
&.open > a, &.open > a,
&.open > a:hover, &.open > a:hover,
&.open > a:focus { &.open > a:focus {
color: #fff;
background-color: @link-color; background-color: @link-color;
border-color: @link-color; border-color: @link-color;
.caret {
border-top-color: #fff;
border-bottom-color: #fff;
}
} }
} }
@ -223,6 +228,27 @@
// Dropdowns // Dropdowns
// ------------------------- // -------------------------
// Make dropdown carets use link color in navs
.nav .caret {
border-top-color: @link-color;
border-bottom-color: @link-color;
}
.nav a:hover .caret {
border-top-color: @link-hover-color;
border-bottom-color: @link-hover-color;
}
/*.nav .active .caret {
border-top-color: #fff;
border-bottom-color: #fff;
}
.nav-tabs .active .caret {
border-top-color: @gray;
border-bottom-color: @gray;
}*/
// Specific dropdowns
.nav-tabs .dropdown-menu { .nav-tabs .dropdown-menu {
// make dropdown border overlap tab border // make dropdown border overlap tab border
margin-top: -1px; margin-top: -1px;
@ -232,20 +258,7 @@
/*
// Make dropdown carets use link color in navs
.nav .caret {
border-top-color: @link-color;
border-bottom-color: @link-color;
}
.nav a:hover .caret {
border-top-color: @link-hover-color;
border-bottom-color: @link-hover-color;
}
// Active dropdown links // Active dropdown links
// ------------------------- // -------------------------
@ -257,16 +270,19 @@
border-top-color: @gray; border-top-color: @gray;
border-bottom-color: @gray; border-bottom-color: @gray;
} }
*/
/*
// Active:hover dropdown links // Active:hover dropdown links
// ------------------------- // -------------------------
.nav > .dropdown.active > a:hover { .nav > .dropdown.active > a:hover {
cursor: pointer; cursor: pointer;
} }
*/
// Open dropdowns /*// Open dropdowns
// ------------------------- // -------------------------
.nav-tabs .open > a, .nav > .open > a,
.nav-pills .open > a, .nav-pills .open > a,
.nav > li.dropdown.open.active > a:hover { .nav > li.dropdown.open.active > a:hover {
color: #fff; color: #fff;
@ -279,79 +295,9 @@
border-top-color: #fff; border-top-color: #fff;
border-bottom-color: #fff; border-bottom-color: #fff;
.opacity(1); .opacity(1);
} }*/
// Dropdowns in stacked tabs /*// Dropdowns in stacked tabs
.tabs-stacked .open > a:hover { .tabs-stacked .open > a:hover {
border-color: @gray-light; border-color: @gray-light;
} }*/
/*
// Prevent IE8 from misplacing imgs
// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
.nav > li > a > img {
max-width: none;
}
// Dropdowns
// -------------------------
.nav-tabs .dropdown-menu {
// Remove the top rounded corners here since there is a hard edge above the menu
.border-top-radius(0);
}
// Default dropdown links
// -------------------------
// Make carets use linkColor to start
.nav .dropdown-toggle .caret {
border-top-color: @link-color;
border-bottom-color: @link-color;
margin-top: 8px;
}
.nav .dropdown-toggle:hover .caret {
border-top-color: @link-hover-color;
border-bottom-color: @link-hover-color;
}
// Active dropdown links
// -------------------------
.nav .active .dropdown-toggle .caret {
border-top-color: #fff;
border-bottom-color: #fff;
}
.nav-tabs .active .dropdown-toggle .caret {
border-top-color: @gray;
border-bottom-color: @gray;
}
// Active:hover dropdown links
// -------------------------
.nav > .dropdown.active > a:hover {
cursor: pointer;
}
// Open dropdowns
// -------------------------
.nav-tabs .open .dropdown-toggle,
.nav-pills .open .dropdown-toggle,
.nav > li.dropdown.open.active > a:hover {
color: #fff;
background-color: @gray-light;
border-color: @gray-light;
}
.nav li.dropdown.open .caret,
.nav li.dropdown.open.active .caret,
.nav li.dropdown.open a:hover .caret {
border-top-color: #fff;
border-bottom-color: #fff;
.opacity(1);
}
// Dropdowns in stacked tabs
.tabs-stacked .open > a:hover {
border-color: @gray-light;
}
*/