clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-27 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix placement of dropdowns in navbar after getting to general in those styles

Browse Source
This commit is contained in:
Mark Otto 2012-01-08 13:30:23 -08:00
parent 0d62778b28
commit 6226b14e3b
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap.css vendored
View File

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

4
bootstrap.min.css vendored
View File

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

6
lib/navs.less
View File

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