mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-20 17:54:23 +01:00
make dropdowns in the topbar black again
This commit is contained in:
Mark Otto
parent
4f67e135dc
commit
b552281558
49
bootstrap-1.1.1.css
vendored
49
bootstrap-1.1.1.css
vendored
@ -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: Fri Aug 26 20:37:39 PDT 2011
|
||||
* Date: Fri Aug 26 23:07:21 PDT 2011
|
||||
*/
|
||||
/* Reset.less
|
||||
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
|
||||
@ -1303,11 +1303,6 @@ table .headerSortUp.purple, table .headerSortDown.purple {
|
||||
position: relative;
|
||||
left: 0;
|
||||
}
|
||||
.nav.secondary-nav {
|
||||
float: right;
|
||||
margin-left: 10px;
|
||||
margin-right: 0;
|
||||
}
|
||||
.nav li {
|
||||
display: block;
|
||||
float: left;
|
||||
@ -1328,9 +1323,48 @@ table .headerSortUp.purple, table .headerSortDown.purple {
|
||||
background-color: #222;
|
||||
background-color: rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
.nav.secondary-nav li .dropdown-menu {
|
||||
.nav.secondary-nav {
|
||||
float: right;
|
||||
margin-left: 10px;
|
||||
margin-right: 0;
|
||||
}
|
||||
.nav.secondary-nav .dropdown .dropdown-menu {
|
||||
right: 0;
|
||||
}
|
||||
.nav .dropdown-toggle:hover, .nav .dropdown.open .dropdown-toggle {
|
||||
background-color: #444;
|
||||
background-color: rgba(255, 255, 255, 0.05);
|
||||
*background-color: #444;
|
||||
}
|
||||
.nav .dropdown-menu {
|
||||
background-color: #333;
|
||||
}
|
||||
.nav .dropdown-menu .dropdown-toggle {
|
||||
color: #fff;
|
||||
}
|
||||
.nav .dropdown-menu .dropdown-toggle.open {
|
||||
background-color: rgba(255, 255, 255, 0.05);
|
||||
}
|
||||
.nav .dropdown-menu li a {
|
||||
color: #999;
|
||||
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
.nav .dropdown-menu li a:hover {
|
||||
background-color: #191919;
|
||||
background-repeat: repeat-x;
|
||||
background-image: -khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));
|
||||
background-image: -moz-linear-gradient(top, #292929, #191919);
|
||||
background-image: -ms-linear-gradient(top, #292929, #191919);
|
||||
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));
|
||||
background-image: -webkit-linear-gradient(top, #292929, #191919);
|
||||
background-image: -o-linear-gradient(top, #292929, #191919);
|
||||
background-image: linear-gradient(top, #292929, #191919);
|
||||
color: #fff;
|
||||
}
|
||||
.nav .dropdown-menu .divider {
|
||||
background-color: #222;
|
||||
border-color: #444;
|
||||
}
|
||||
.dropdown {
|
||||
position: relative;
|
||||
}
|
||||
@ -1417,6 +1451,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
|
||||
}
|
||||
.dropdown.open .dropdown-toggle {
|
||||
color: #fff;
|
||||
background-color: #ccc;
|
||||
background-color: rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
.dropdown.open .dropdown-menu {
|
||||
|
||||
11
bootstrap-1.1.1.min.css
vendored
11
bootstrap-1.1.1.min.css
vendored
@ -186,15 +186,18 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0
|
||||
.topbar form input::-webkit-input-placeholder{color:#e6e6e6;}
|
||||
.topbar form input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#fff;}
|
||||
.topbar form input:focus,.topbar form input.focused{outline:none;background-color:#fff;color:#404040;text-shadow:0 1px 0 #fff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);}
|
||||
.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}
|
||||
.nav li{display:block;float:left;font-size:13px;}.nav li a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav li a:hover{color:#fff;text-decoration:none;}
|
||||
.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.nav li{display:block;float:left;font-size:13px;}.nav li a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav li a:hover{color:#fff;text-decoration:none;}
|
||||
.nav li.active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
|
||||
.nav.secondary-nav li .dropdown-menu{right:0;}
|
||||
.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown .dropdown-menu{right:0;}
|
||||
.nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background-color:#444;background-color:rgba(255, 255, 255, 0.05);*background-color:#444;}
|
||||
.nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#fff;}.nav .dropdown-menu .dropdown-toggle.open{background-color:rgba(255, 255, 255, 0.05);}
|
||||
.nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);color:#fff;}
|
||||
.nav .dropdown-menu .divider{background-color:#222;border-color:#444;}
|
||||
.dropdown{position:relative;}
|
||||
.dropdown-toggle:after{width:0;height:0;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;}
|
||||
.dropdown-menu{background-color:#fff;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.dropdown-menu li{float:none;display:block;background-color:none;}.dropdown-menu li a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #fff;}.dropdown-menu li a:hover{background-color:#dddddd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);}
|
||||
.dropdown-menu li.divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #fff;}
|
||||
.dropdown.open .dropdown-toggle{color:#fff;background-color:rgba(0, 0, 0, 0.3);}
|
||||
.dropdown.open .dropdown-toggle{color:#fff;background-color:#ccc;background-color:rgba(0, 0, 0, 0.3);}
|
||||
.dropdown.open .dropdown-menu{display:block;}
|
||||
.tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;margin-bottom:18px;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
|
||||
.tabs:after,.pills:after{clear:both;}
|
||||
|
||||
@ -105,6 +105,8 @@
|
||||
|
||||
// NAVIGATION
|
||||
// ----------
|
||||
|
||||
// Topbar Nav
|
||||
// ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
|
||||
.nav {
|
||||
display: block;
|
||||
@ -112,11 +114,6 @@
|
||||
margin: 0 10px 0 0;
|
||||
position: relative;
|
||||
left: 0;
|
||||
&.secondary-nav {
|
||||
float: right;
|
||||
margin-left: 10px;
|
||||
margin-right: 0;
|
||||
}
|
||||
li {
|
||||
display: block;
|
||||
float: left;
|
||||
@ -138,9 +135,42 @@
|
||||
}
|
||||
}
|
||||
|
||||
// Secondary (floated right) nav in topbar
|
||||
&.secondary-nav {
|
||||
float: right;
|
||||
margin-left: 10px;
|
||||
margin-right: 0;
|
||||
.dropdown .dropdown-menu {
|
||||
right: 0;
|
||||
}
|
||||
}
|
||||
// Dropdowns within the .nav
|
||||
&.secondary-nav li .dropdown-menu {
|
||||
right: 0;
|
||||
.dropdown-toggle:hover,
|
||||
.dropdown.open .dropdown-toggle {
|
||||
background-color: #444;
|
||||
background-color: rgba(255,255,255,.05);
|
||||
*background-color: #444; // IE6-7
|
||||
}
|
||||
.dropdown-menu {
|
||||
background-color: #333;
|
||||
.dropdown-toggle {
|
||||
color: #fff;
|
||||
&.open {
|
||||
background-color: rgba(255,255,255,.05);
|
||||
}
|
||||
}
|
||||
li a {
|
||||
color: #999;
|
||||
text-shadow: 0 1px 0 rgba(0,0,0,.5);
|
||||
&:hover {
|
||||
#gradient > .vertical(#292929,#191919);
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
.divider {
|
||||
background-color: #222;
|
||||
border-color: #444;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -223,6 +253,7 @@
|
||||
.dropdown.open {
|
||||
.dropdown-toggle {
|
||||
color: #fff;
|
||||
background-color: #ccc;
|
||||
background-color: rgba(0,0,0,.3);
|
||||
}
|
||||
.dropdown-menu {
|
||||
@ -230,6 +261,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Tabs and Pills
|
||||
.tabs,
|
||||
.pills {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user