aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-08-31 10:55:53 -0700
committerJacob Thornton <[email protected]>2011-08-31 10:55:53 -0700
commitf6a4dd95b62771b105530c85a98901f06bfecdd7 (patch)
treefc708c8707d617af63aa7fdba8937952025134fc
parent90d174a34d0c1c0da590fa8f21b1852e358ba0f9 (diff)
downloadbootstrap-f6a4dd95b62771b105530c85a98901f06bfecdd7.tar.xz
bootstrap-f6a4dd95b62771b105530c85a98901f06bfecdd7.zip
try daves background thing again...
-rw-r--r--bootstrap-1.2.0.css25
-rw-r--r--bootstrap-1.2.0.min.css8
-rw-r--r--lib/patterns.less19
3 files changed, 21 insertions, 31 deletions
diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css
index b1cc2f136..98f1b20db 100644
--- a/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.0.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: Tue Aug 30 23:37:26 PDT 2011
+ * Date: Wed Aug 31 10:55:48 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-color: rgba(255, 255, 255, 0.05);
- *background-color: #444;
+ background: #444;
+ background: rgba(255, 255, 255, 0.05);
}
.nav .dropdown-menu {
background-color: #333;
@@ -1233,8 +1232,8 @@ table .headerSortUp.purple, table .headerSortDown.purple {
color: #fff;
}
.nav .dropdown-menu .dropdown-toggle.open {
- background-color: rgba(255, 255, 255, 0.05);
- *background-color: #444;
+ background: #444;
+ background: rgba(255, 255, 255, 0.05);
}
.nav .dropdown-menu li a {
color: #999;
@@ -1342,11 +1341,8 @@ table .headerSortUp.purple, table .headerSortDown.purple {
}
.dropdown.open .dropdown-toggle {
color: #fff;
- background-color: #ccc;
- background-color: rgba(0, 0, 0, 0.3);
- *background-color: #ccc;
- /* ie6 -7 */
-
+ background: #ccc;
+ background: rgba(0, 0, 0, 0.3);
}
.dropdown.open .dropdown-menu {
display: block;
@@ -1883,11 +1879,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
height: 0;
}
.popover .inner {
- background-color: #333;
- background-color: rgba(0, 0, 0, 0.8);
- *background-color: #333;
- /* IE 6-7 */
-
+ background: #333;
+ background: rgba(0, 0, 0, 0.8);
padding: 3px;
overflow: hidden;
width: 280px;
diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css
index 8238cbbc6..db834b105 100644
--- a/bootstrap-1.2.0.min.css
+++ b/bootstrap-1.2.0.min.css
@@ -186,8 +186,8 @@ 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-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-toggle:hover,.nav .dropdown.open .dropdown-toggle{background:#444;background: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:#444;background: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);*background-color:#ccc;}
+.dropdown.open .dropdown-toggle{color:#fff;background:#ccc;background: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;}
@@ -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: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 38fbd8da0..91294103c 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -147,17 +147,16 @@
// Dropdowns within the .nav
.dropdown-toggle:hover,
.dropdown.open .dropdown-toggle {
- background-color: #444;
- background-color: rgba(255,255,255,.05);
- *background-color: #444; // IE6-7
+ background: #444;
+ background: rgba(255,255,255,.05);
}
.dropdown-menu {
background-color: #333;
.dropdown-toggle {
color: #fff;
&.open {
- background-color: rgba(255,255,255,.05);
- *background-color: #444;
+ background: #444;
+ background: rgba(255,255,255,.05);
}
}
li a {
@@ -254,9 +253,8 @@
.dropdown.open {
.dropdown-toggle {
color: #fff;
- background-color: #ccc;
- background-color: rgba(0,0,0,.3);
- *background-color: #ccc; /* ie6 -7 */
+ background: #ccc;
+ background: rgba(0,0,0,.3);
}
.dropdown-menu {
display: block;
@@ -745,9 +743,8 @@ input[type=submit].btn {
height: 0;
}
.inner {
- background-color: #333;
- background-color: rgba(0,0,0,.8);
- *background-color: #333; /* IE 6-7 */
+ background: #333;
+ background: rgba(0,0,0,.8);
padding: 3px;
overflow: hidden;
width: 280px;