mirror of
https://github.com/twbs/bootstrap.git
synced 2024-09-24 20:17:19 +00:00
adjust navs for fine details on dropdowns in stacked nav and improved open state there
This commit is contained in:
parent
916761d568
commit
cf05dc8677
17
bootstrap.css
vendored
17
bootstrap.css
vendored
@ -6,7 +6,7 @@
|
|||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
*
|
||||||
* Designed and built with all the love in the world @twitter by @mdo and @fat.
|
* Designed and built with all the love in the world @twitter by @mdo and @fat.
|
||||||
* Date: Sun Jan 8 01:56:47 PST 2012
|
* Date: Sun Jan 8 02:15:22 PST 2012
|
||||||
*/
|
*/
|
||||||
html, body {
|
html, body {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
@ -1925,7 +1925,7 @@ i {
|
|||||||
.pills.stacked > li:last-child > a {
|
.pills.stacked > li:last-child > a {
|
||||||
margin-bottom: 1px;
|
margin-bottom: 1px;
|
||||||
}
|
}
|
||||||
.tabs .dropdown-menu, .pills .dropdown-menu {
|
.nav .dropdown-menu {
|
||||||
top: 33px;
|
top: 33px;
|
||||||
border-width: 1px;
|
border-width: 1px;
|
||||||
}
|
}
|
||||||
@ -1934,19 +1934,26 @@ i {
|
|||||||
-moz-border-radius: 4px;
|
-moz-border-radius: 4px;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
}
|
}
|
||||||
.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret {
|
.nav .dropdown-toggle .caret {
|
||||||
|
border-top-color: #0088cc;
|
||||||
margin-top: 6px;
|
margin-top: 6px;
|
||||||
}
|
}
|
||||||
.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle {
|
.nav .dropdown-toggle:hover .caret {
|
||||||
|
border-top-color: #005580;
|
||||||
|
}
|
||||||
|
.nav .open .dropdown-toggle {
|
||||||
background-color: #999;
|
background-color: #999;
|
||||||
border-color: #999;
|
border-color: #999;
|
||||||
}
|
}
|
||||||
.tabs .open .caret, .pills .open .caret {
|
.nav .open .caret, .nav .open a:hover .caret {
|
||||||
border-top-color: #fff;
|
border-top-color: #fff;
|
||||||
filter: alpha(opacity=100);
|
filter: alpha(opacity=100);
|
||||||
-moz-opacity: 1;
|
-moz-opacity: 1;
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
.tabs.stacked .open > a:hover {
|
||||||
|
border-color: #999;
|
||||||
|
}
|
||||||
.tabbable {
|
.tabbable {
|
||||||
zoom: 1;
|
zoom: 1;
|
||||||
}
|
}
|
||||||
|
10
bootstrap.min.css
vendored
10
bootstrap.min.css
vendored
@ -368,11 +368,13 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
|
|||||||
.tabs.stacked>li>a:hover{border-color:#ddd;z-index:2;}
|
.tabs.stacked>li>a:hover{border-color:#ddd;z-index:2;}
|
||||||
.pills.stacked>li>a{margin-bottom:3px;}
|
.pills.stacked>li>a{margin-bottom:3px;}
|
||||||
.pills.stacked>li:last-child>a{margin-bottom:1px;}
|
.pills.stacked>li:last-child>a{margin-bottom:1px;}
|
||||||
.tabs .dropdown-menu,.pills .dropdown-menu{top:33px;border-width:1px;}
|
.nav .dropdown-menu{top:33px;border-width:1px;}
|
||||||
.pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
|
.pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
|
||||||
.tabs .dropdown-toggle .caret,.pills .dropdown-toggle .caret{margin-top:6px;}
|
.nav .dropdown-toggle .caret{border-top-color:#0088cc;margin-top:6px;}
|
||||||
.tabs .open .dropdown-toggle,.pills .open .dropdown-toggle{background-color:#999;border-color:#999;}
|
.nav .dropdown-toggle:hover .caret{border-top-color:#005580;}
|
||||||
.tabs .open .caret,.pills .open .caret{border-top-color:#fff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
|
.nav .open .dropdown-toggle{background-color:#999;border-color:#999;}
|
||||||
|
.nav .open .caret,.nav .open a:hover .caret{border-top-color:#fff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
|
||||||
|
.tabs.stacked .open>a:hover{border-color:#999;}
|
||||||
.tabbable{zoom:1;}.tabbable:before,.tabbable:after{display:table;*display:inline;content:"";zoom:1;}
|
.tabbable{zoom:1;}.tabbable:before,.tabbable:after{display:table;*display:inline;content:"";zoom:1;}
|
||||||
.tabbable:after{clear:both;}
|
.tabbable:after{clear:both;}
|
||||||
.tabs-below .tabs,.tabs-right .tabs,.tabs-left .tabs{border-bottom:0;}
|
.tabs-below .tabs,.tabs-right .tabs,.tabs-left .tabs{border-bottom:0;}
|
||||||
|
@ -175,29 +175,35 @@
|
|||||||
// ---------
|
// ---------
|
||||||
|
|
||||||
// Position the menu
|
// Position the menu
|
||||||
.tabs .dropdown-menu,
|
.nav .dropdown-menu {
|
||||||
.pills .dropdown-menu {
|
|
||||||
top: 33px;
|
top: 33px;
|
||||||
border-width: 1px;
|
border-width: 1px;
|
||||||
}
|
}
|
||||||
.pills .dropdown-menu {
|
.pills .dropdown-menu {
|
||||||
.border-radius(4px);
|
.border-radius(4px);
|
||||||
}
|
}
|
||||||
.tabs .dropdown-toggle .caret,
|
.nav .dropdown-toggle .caret {
|
||||||
.pills .dropdown-toggle .caret {
|
border-top-color: @linkColor;
|
||||||
margin-top: 6px;
|
margin-top: 6px;
|
||||||
}
|
}
|
||||||
.tabs .open .dropdown-toggle,
|
.nav .dropdown-toggle:hover .caret {
|
||||||
.pills .open .dropdown-toggle {
|
border-top-color: @linkColorHover;
|
||||||
|
}
|
||||||
|
.nav .open .dropdown-toggle {
|
||||||
background-color: #999;
|
background-color: #999;
|
||||||
border-color: #999;
|
border-color: #999;
|
||||||
}
|
}
|
||||||
.tabs .open .caret,
|
.nav .open .caret,
|
||||||
.pills .open .caret {
|
.nav .open a:hover .caret {
|
||||||
border-top-color: #fff;
|
border-top-color: #fff;
|
||||||
.opacity(100);
|
.opacity(100);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Dropdowns in stacked tabs
|
||||||
|
.tabs.stacked .open > a:hover {
|
||||||
|
border-color: #999;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// TABBABLE
|
// TABBABLE
|
||||||
|
Loading…
Reference in New Issue
Block a user