From: Jacob Thornton Date: Mon, 22 Aug 2011 03:21:59 +0000 (-0700) Subject: fix color for alert blocks in ie6-7 X-Git-Tag: v1.1.0~14^2~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=842ad01fce710c50dc9c0174ab790f91e66c46b1;p=thirdparty%2Fbootstrap.git fix color for alert blocks in ie6-7 --- diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index ed1f3a20c7..f3487612ca 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.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: Sun Aug 21 19:59:40 PDT 2011 + * Date: Sun Aug 21 20:21:55 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). @@ -1440,6 +1440,9 @@ div.block-message { padding: 14px; color: #404040; color: rgba(0, 0, 0, 0.8); + *color: #404040; + /* IE 6-7 */ + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); -webkit-border-radius: 6px; -moz-border-radius: 6px; @@ -1448,6 +1451,9 @@ div.block-message { div.block-message p { color: #404040; color: rgba(0, 0, 0, 0.8); + *color: #404040; + /* IE 6-7 */ + margin-right: 30px; margin-bottom: 0; } diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 598725b0a8..200b5a4489 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -183,7 +183,7 @@ div.alert-message.warning{background-color:#ffd75a;} div.alert-message.success{background-color:#74c474;} div.alert-message.info{background-color:#30c0fb;} div.alert-message a.close{float:right;margin-top:-2px;color:#fff;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;}div.alert-message a.close:hover{text-decoration:none;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} -div.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}div.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);margin-right:30px;margin-bottom:0;} +div.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}div.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;margin-right:30px;margin-bottom:0;} div.block-message ul{margin-bottom:0;} 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);} diff --git a/lib/patterns.less b/lib/patterns.less index e920122407..02aeaf5597 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -338,11 +338,13 @@ div.block-message { padding: 14px; color: @grayDark; color: rgba(0,0,0,.8); + *color: @grayDark; /* IE 6-7 */ text-shadow: 0 1px 0 rgba(255,255,255,.25); .border-radius(6px); p { color: @grayDark; color: rgba(0,0,0,.8); + *color: @grayDark; /* IE 6-7 */ margin-right: 30px; margin-bottom: 0; }