Skip to content

B
bootstrap
Commit 2aeed35f authored by Mark Otto's avatar Mark Otto
Browse files
Options

pull filter gradients out completely because IE can't render them correctly in... 

pull filter gradients out completely because IE can't render them correctly in half of all instances and they are performance problems with them; tweak alert message styles, particularly close button;
parent 72899a4e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 76 deletions
bootstrap-1.0.0.css
View file @ 2aeed35f
......@@ -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: Sat Aug 20 18:40:26 PDT 2011
* Date: Sun Aug 21 17:28:43 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).
......@@ -421,8 +421,6 @@ a:hover {
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
background-image: -webkit-linear-gradient(#049cdb, #0064cd);
background-image: -o-linear-gradient(#049cdb, #0064cd);
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
background-image: linear-gradient(#049cdb, #0064cd);
color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
......@@ -1101,8 +1099,6 @@ div.topbar {
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
background-image: -webkit-linear-gradient(#333333, #222222);
background-image: -o-linear-gradient(#333333, #222222);
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
background-image: linear-gradient(#333333, #222222);
height: 40px;
position: fixed;
......@@ -1353,23 +1349,12 @@ div.page-header h1 {
margin-bottom: 8px;
}
div.alert-message {
background-color: rgba(0, 0, 0, 0.15);
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));
background-image: -moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
background-image: -ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));
background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
background-image: -o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);
background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15));
background-color: #e6e6e6;
margin-bottom: 18px;
padding: 8px 15px;
color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
border-bottom: 1px solid rgba(0, 0, 0, 0.25);
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
border-bottom: 1px solid rgba(0, 0, 0, 0.3);
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
......@@ -1382,38 +1367,71 @@ div.alert-message p + p {
margin-top: 5px;
}
div.alert-message.error {
background-color: #e06359;
background-color: #d83a2e;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e));
background-image: -moz-linear-gradient(#e4776f, #d83a2e);
background-image: -ms-linear-gradient(#e4776f, #d83a2e);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e));
background-image: -webkit-linear-gradient(#e4776f, #d83a2e);
background-image: -o-linear-gradient(#e4776f, #d83a2e);
background-image: linear-gradient(#e4776f, #d83a2e);
border-bottom-color: #b32b21;
}
div.alert-message.warning {
background-color: #ffd75a;
background-color: #ffd040;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040));
background-image: -moz-linear-gradient(#ffe38d, #ffd040);
background-image: -ms-linear-gradient(#ffe38d, #ffd040);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040));
background-image: -webkit-linear-gradient(#ffe38d, #ffd040);
background-image: -o-linear-gradient(#ffe38d, #ffd040);
background-image: linear-gradient(#ffe38d, #ffd040);
border-bottom-color: #ffc40d;
}
div.alert-message.success {
background-color: #74c474;
background-color: #62bc62;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62));
background-image: -moz-linear-gradient(#97d397, #62bc62);
background-image: -ms-linear-gradient(#97d397, #62bc62);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62));
background-image: -webkit-linear-gradient(#97d397, #62bc62);
background-image: -o-linear-gradient(#97d397, #62bc62);
background-image: linear-gradient(#97d397, #62bc62);
border-bottom-color: #46a546;
}
div.alert-message.info {
background-color: #30c0fb;
background-color: #04aef4;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4));
background-image: -moz-linear-gradient(#62cffc, #04aef4);
background-image: -ms-linear-gradient(#62cffc, #04aef4);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4));
background-image: -webkit-linear-gradient(#62cffc, #04aef4);
background-image: -o-linear-gradient(#62cffc, #04aef4);
background-image: linear-gradient(#62cffc, #04aef4);
border-bottom-color: #049cdb;
}
div.alert-message a.close {
div.alert-message .close {
float: right;
margin-top: -2px;
color: #fff;
color: #000;
font-size: 20px;
font-weight: bold;
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
filter: alpha(opacity=50);
-khtml-opacity: 0.5;
-moz-opacity: 0.5;
opacity: 0.5;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
text-shadow: 0 1px 0 #ffffff;
filter: alpha(opacity=20);
-khtml-opacity: 0.2;
-moz-opacity: 0.2;
opacity: 0.2;
}
div.alert-message a.close:hover {
div.alert-message .close:hover {
text-decoration: none;
filter: alpha(opacity=50);
-khtml-opacity: 0.5;
-moz-opacity: 0.5;
opacity: 0.5;
filter: alpha(opacity=40);
-khtml-opacity: 0.4;
-moz-opacity: 0.4;
opacity: 0.4;
}
div.block-message {
margin-bottom: 18px;
......@@ -1437,12 +1455,6 @@ div.block-message ul {
div.block-message strong {
display: block;
}
div.block-message a.close {
display: block;
color: #404040;
color: rgba(0, 0, 0, 0.5);
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
}
div.block-message.error {
background: #f8dcda;
border: 1px solid #f4c8c5;
......
bootstrap-1.0.0.min.css
View file @ 2aeed35f
This diff is collapsed.
docs/index.html
View file @ 2aeed35f
......@@ -1167,7 +1167,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
</div>
</div>
</div>
<img class="large-bird" src="assets/img/bird.png" width="220px" height="48px">
<img class="large-bird" src="assets/img/bird.png" width="220px" height="145px">
</div>
</div>
</div>
......
lib/patterns.less
View file @ 2aeed35f
......@@ -276,13 +276,13 @@ div.page-header {
// One-liner alert bars
div.alert-message {
#gradient > .vertical(transparent, rgba(0,0,0,0.15));
// #gradient > .vertical(rgba(0,0,0,.01), rgba(0,0,0,0.15));
background-color: @grayLighter;
margin-bottom: @baseline;
padding: 8px 15px;
color: #fff;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
border-bottom: 1px solid rgba(0,0,0,.25);
text-shadow: 0 -1px 0 rgba(0,0,0,.3);
border-bottom: 1px solid rgba(0,0,0,.3);
.border-radius(4px);
p {
color: #fff;
......@@ -292,29 +292,32 @@ div.alert-message {
}
}
&.error {
background-color: lighten(@red, 25%);
#gradient > .vertical(lighten(@red, 30%), lighten(@red, 15%));
border-bottom-color: lighten(@red, 5%);
}
&.warning {
background-color: lighten(@yellow, 15%);
#gradient > .vertical(lighten(@yellow, 25%), lighten(@yellow, 10%));
border-bottom-color: @yellow;
}
&.success {
background-color: lighten(@green, 15%);
#gradient > .vertical(lighten(@green, 25%), lighten(@green, 10%));
border-bottom-color: @green;
}
&.info {
background-color: lighten(@blue, 15%);
#gradient > .vertical(lighten(@blue, 25%), lighten(@blue, 5%));
border-bottom-color: @blue;
}
a.close {
.close {
float: right;
margin-top: -2px;
color: #fff;
color: #000;
font-size: 20px;
font-weight: bold;
text-shadow: 0 1px 0 rgba(0,0,0,.5);
.opacity(50);
.border-radius(3px);
text-shadow: 0 1px 0 rgba(255,255,255,1);
.opacity(20);
&:hover {
text-decoration: none;
.opacity(50);
.opacity(40);
}
}
}
......@@ -339,12 +342,6 @@ div.block-message {
strong {
display: block;
}
a.close {
display: block;
color: @grayDark;
color: rgba(0,0,0,.5);
text-shadow: 0 1px 1px rgba(255,255,255,.75);
}
&.error {
background: lighten(@red, 55%);
border: 1px solid lighten(@red, 50%);
......
lib/preboot.less
View file @ 2aeed35f
......@@ -223,8 +223,6 @@
background-image: -webkit-gradient(linear, left top, right top, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+
background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
-ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor); // IE8+
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE6 & IE7
background-image: linear-gradient(left, @startColor, @endColor); // Le standard
}
.vertical (@startColor: #555, @endColor: #333) {
......@@ -236,8 +234,6 @@
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+
background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10
-ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor); // IE8+
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7
background-image: linear-gradient(@startColor, @endColor); // The standard
}
.directional (@startColor: #555, @endColor: #333, @deg: 45deg) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment