remove * hack for ie7 + remove -1 margin bug for ie7

diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css
index 5171561f5901afe4e401b1d0f62d47846fd55f1c..e4387ec46097e8a3d51ebe11e3e73b2ea3e25ef3 100644 (file)
--- a/bootstrap-1.1.1.css
+++ b/bootstrap-1.1.1.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: Mon Aug 29 22:43:36 PDT 2011
+ * Date: Tue Aug 30 23:02:58 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).
@@ -1222,9 +1222,8 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   right: 0;
 }
 .nav .dropdown-toggle:hover, .nav .dropdown.open .dropdown-toggle {
-  background-color: #444;
+  background: #444;
   background-color: rgba(255, 255, 255, 0.05);
-  *background-color: #444;
 }
 .nav .dropdown-menu {
   background-color: #333;
@@ -1341,11 +1340,8 @@ table .headerSortUp.purple, table .headerSortDown.purple {
 }
 .dropdown.open .dropdown-toggle {
   color: #fff;
-  background-color: #ccc;
+  background: #ccc;
   background-color: rgba(0, 0, 0, 0.3);
-  *background-color: #ccc;
-  /* ie6 -7 */
-
 }
 .dropdown.open .dropdown-menu {
   display: block;
@@ -1379,9 +1375,9 @@ table .headerSortUp.purple, table .headerSortDown.purple {
 }
 .tabs > li {
   position: relative;
+  top: 1px;
 }
 .tabs > li > a {
-  margin-bottom: -1px;
   margin-right: 2px;
   padding: 0 15px;
   line-height: 35px;
@@ -1882,11 +1878,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   height: 0;
 }
 .popover .inner {
-  background-color: #333;
+  background: #333;
   background-color: rgba(0, 0, 0, 0.8);
-  *background-color: #333;
-  /* IE 6-7 */
-
   padding: 3px;
   overflow: hidden;
   width: 280px;

diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.1.1.min.css
index 2ed10b26d683d863599d3f3117e6955e471e38ed..115f34e9efd8318620bb56a4eb69d40ad4834a38 100644 (file)
--- a/bootstrap-1.1.1.min.css
+++ b/bootstrap-1.1.1.min.css
@@ -186,7 +186,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0
 .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#fff;text-decoration:none;}
 .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-toggle:hover,.nav .dropdown.open .dropdown-toggle{background:#444;background-color:rgba(255, 255, 255, 0.05);}
 .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;}
@@ -195,12 +195,12 @@ 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);*background-color:#ccc;}
+.dropdown.open .dropdown-toggle{color:#fff;background:#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;}
 .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;}
-.tabs{width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;}.tabs>li>a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{background-color:#eee;border-bottom:1px solid #ddd;text-decoration:none;}
+.tabs{width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{background-color:#eee;border-bottom:1px solid #ddd;text-decoration:none;}
 .tabs>li.active>a{background-color:#fff;padding:0 14px;border:1px solid #ddd;border-bottom:0;color:#808080;}
 .tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;}
 .tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;}
@@ -255,6 +255,6 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
 .popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
 .popover .arrow{position:absolute;width:0;height:0;}
-.popover .inner{background-color:#333;background-color:rgba(0, 0, 0, 0.8);*background-color:#333;padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);}
+.popover .inner{background:#333;background-color:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);}
 .popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;}
 .popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}

diff --git a/lib/patterns.less b/lib/patterns.less
index a4bc6b855af32c2559bb55bb05f4ad697aa57b8f..f7f5d75bbf88701548cc006497a69cbb58919d3d 100644 (file)
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -147,9 +147,8 @@
   // Dropdowns within the .nav
   .dropdown-toggle:hover,
   .dropdown.open .dropdown-toggle {
-    background-color: #444;
+    background: #444;
     background-color: rgba(255,255,255,.05);
-    *background-color: #444; // IE6-7
   }
   .dropdown-menu {
     background-color: #333;
@@ -253,9 +252,8 @@
 .dropdown.open {
   .dropdown-toggle {
     color: #fff;
-    background-color: #ccc;
+    background: #ccc;
     background-color: rgba(0,0,0,.3);
-    *background-color: #ccc; /* ie6 -7 */
   }
   .dropdown-menu {
     display: block;
@@ -284,8 +282,8 @@
   border-bottom: 1px solid #ddd;
   > li {
     position: relative; // For the dropdowns mostly
+    top: 1px;
     > a {
-      margin-bottom: -1px;
       margin-right: 2px;
       padding: 0 15px;
       line-height: (@baseline * 2) - 1;
@@ -744,9 +742,8 @@ input[type=submit].btn {
     height: 0;
   }
   .inner {
-    background-color: #333;
+    background: #333;
     background-color: rgba(0,0,0,.8);
-    *background-color: #333; /* IE 6-7 */
     padding: 3px;
     overflow: hidden;
     width: 280px;