diff --git a/bootstrap.css b/bootstrap.css index baafd0dd94..1fc88441ab 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Jan 8 13:21:31 PST 2012 + * Date: Sun Jan 8 13:30:08 PST 2012 */ html, body { margin: 0; @@ -1925,7 +1925,7 @@ i { .pills.stacked > li:last-child > a { margin-bottom: 1px; } -.nav .dropdown-menu { +.pills .dropdown-menu, .tabs .dropdown-menu { top: 33px; border-width: 1px; } @@ -1941,7 +1941,7 @@ i { .tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret { border-top-color: #005580; } -.nav .open .dropdown-toggle { +.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle { background-color: #999; border-color: #999; } diff --git a/bootstrap.min.css b/bootstrap.min.css index 17a2c107b1..a776da8886 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -368,11 +368,11 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou .tabs.stacked>li>a:hover{border-color:#ddd;z-index:2;} .pills.stacked>li>a{margin-bottom:3px;} .pills.stacked>li:last-child>a{margin-bottom:1px;} -.nav .dropdown-menu{top:33px;border-width:1px;} +.pills .dropdown-menu,.tabs .dropdown-menu{top:33px;border-width:1px;} .pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .tabs .dropdown-toggle .caret,.pills .dropdown-toggle .caret{border-top-color:#0088cc;margin-top:6px;} .tabs .dropdown-toggle:hover .caret,.pills .dropdown-toggle:hover .caret{border-top-color:#005580;} -.nav .open .dropdown-toggle{background-color:#999;border-color:#999;} +.tabs .open .dropdown-toggle,.pills .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;} diff --git a/lib/navs.less b/lib/navs.less index 65d459da93..804a273bb4 100644 --- a/lib/navs.less +++ b/lib/navs.less @@ -175,7 +175,8 @@ // --------- // Position the menu -.nav .dropdown-menu { +.pills .dropdown-menu, +.tabs .dropdown-menu { top: 33px; border-width: 1px; } @@ -191,7 +192,8 @@ .pills .dropdown-toggle:hover .caret { border-top-color: @linkColorHover; } -.nav .open .dropdown-toggle { +.tabs .open .dropdown-toggle, +.pills .open .dropdown-toggle { background-color: #999; border-color: #999; }