0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00

fix background color for ie7 -- negative margin bug still there though ;_;

This commit is contained in:
Jacob Thornton 2011-08-29 22:43:40 -07:00
parent efd6fd609c
commit afec7859cc
3 changed files with 7 additions and 5 deletions

6
bootstrap-1.1.1.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: Mon Aug 29 22:36:01 PDT 2011
* Date: Mon Aug 29 22:43:36 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).
@ -1234,7 +1234,6 @@ table .headerSortUp.purple, table .headerSortDown.purple {
}
.nav .dropdown-menu .dropdown-toggle.open {
background-color: rgba(255, 255, 255, 0.05);
*background-color: #444;
}
.nav .dropdown-menu li a {
color: #999;
@ -1344,6 +1343,9 @@ table .headerSortUp.purple, table .headerSortDown.purple {
color: #fff;
background-color: #ccc;
background-color: rgba(0, 0, 0, 0.3);
*background-color: #ccc;
/* ie6 -7 */
}
.dropdown.open .dropdown-menu {
display: block;

View File

@ -187,7 +187,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0
.nav .active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .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);*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;}
@ -195,7 +195,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0
.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 a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #fff;}.dropdown-menu 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 .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #fff;}
.dropdown.open .dropdown-toggle{color:#fff;background-color:#ccc;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);*background-color:#ccc;}
.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;}

View File

@ -157,7 +157,6 @@
color: #fff;
&.open {
background-color: rgba(255,255,255,.05);
*background-color: #444; // IE6-7
}
}
li a {
@ -256,6 +255,7 @@
color: #fff;
background-color: #ccc;
background-color: rgba(0,0,0,.3);
*background-color: #ccc; /* ie6 -7 */
}
.dropdown-menu {
display: block;