diff options
| author | Mark Otto <[email protected]> | 2011-08-25 02:00:07 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-25 02:00:07 -0700 |
| commit | 50f484eed6e9161cb7e50531b0fa3f16ada549e0 (patch) | |
| tree | c00fa9c33f2ea7781316ccad6b2038519a99a9ca /bootstrap-1.1.0.css | |
| parent | 8368cfd523fab964ebd3132e29332b4680cedba5 (diff) | |
| download | bootstrap-50f484eed6e9161cb7e50531b0fa3f16ada549e0.tar.xz bootstrap-50f484eed6e9161cb7e50531b0fa3f16ada549e0.zip | |
big update to change the alerts, normal and block level, to have simpler css and new colors independent of the base color scheme
Diffstat (limited to 'bootstrap-1.1.0.css')
| -rw-r--r-- | bootstrap-1.1.0.css | 205 |
1 files changed, 103 insertions, 102 deletions
diff --git a/bootstrap-1.1.0.css b/bootstrap-1.1.0.css index ee0cc3fdf..246094daf 100644 --- a/bootstrap-1.1.0.css +++ b/bootstrap-1.1.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: Wed Aug 24 19:43:43 PDT 2011 + * Date: Thu Aug 25 01:55:33 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). @@ -127,7 +127,7 @@ aside { * ------------------------------------------------------------------------------------------- */ .row { zoom: 1; - margin: 0 -20px; + margin-left: -20px; } .row:before, .row:after { display: table; @@ -152,9 +152,9 @@ aside { .row .span14, .row .span15, .row .span16 { + display: inline; float: left; margin-left: 20px; - *display: inline; } .row .span1 { width: 40px; @@ -1324,86 +1324,103 @@ footer { .page-header h1 { margin-bottom: 8px; } -.alert-message { - background-color: rgba(0, 0, 0, 0.15); +.alert { + background-color: #eedc94; 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)); - background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')"; - background-color: #e6e6e6; + background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); + background-image: -moz-linear-gradient(#fceec1, #eedc94); + background-image: -ms-linear-gradient(#fceec1, #eedc94); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94)); + background-image: -webkit-linear-gradient(#fceec1, #eedc94); + background-image: -o-linear-gradient(#fceec1, #eedc94); + background-image: linear-gradient(#fceec1, #eedc94); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #e7ce68 #e7ce68 #e4c652; + border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125); margin-bottom: 18px; - padding: 8px 15px; - color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); - border-bottom: 1px solid rgba(0, 0, 0, 0.3); + padding: 7px 14px; + color: #404040; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + border-width: 1px; + border-style: solid; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); } -.alert-message p { - color: #fff; +.alert h5 { + line-height: 18px; +} +.alert p { margin-bottom: 0; } -.alert-message p + p { +.alert div { margin-top: 5px; + margin-bottom: 2px; + line-height: 28px; +} +.alert .btn { + -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); + -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); +} +.alert-error, +.alert-success, +.alert-info, +.alert-error h5, +.alert-success h5, +.alert-info h5 { + color: #fff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); } -.alert-message.error { - background-color: #d83a2e; +.alert-error { + background-color: #d6463e; 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; -} -.alert-message.warning { - 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; + background-image: -khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e)); + background-image: -moz-linear-gradient(#f56a66, #d6463e); + background-image: -ms-linear-gradient(#f56a66, #d6463e); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f56a66), color-stop(100%, #d6463e)); + background-image: -webkit-linear-gradient(#f56a66, #d6463e); + background-image: -o-linear-gradient(#f56a66, #d6463e); + background-image: linear-gradient(#f56a66, #d6463e); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #ba2f27 #ba2f27 #a52a23; + border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125); } -.alert-message.success { - background-color: #62bc62; +.alert-success { + background-color: #57a957; 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; + background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); + background-image: -moz-linear-gradient(#62c462, #57a957); + background-image: -ms-linear-gradient(#62c462, #57a957); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); + background-image: -webkit-linear-gradient(#62c462, #57a957); + background-image: -o-linear-gradient(#62c462, #57a957); + background-image: linear-gradient(#62c462, #57a957); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #458845 #458845 #3d773d; + border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125); } -.alert-message.info { - background-color: #04aef4; +.alert-info { + background-color: #36b3d9; 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; + background-image: -khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9)); + background-image: -moz-linear-gradient(#6bd0ee, #36b3d9); + background-image: -ms-linear-gradient(#6bd0ee, #36b3d9); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #6bd0ee), color-stop(100%, #36b3d9)); + background-image: -webkit-linear-gradient(#6bd0ee, #36b3d9); + background-image: -o-linear-gradient(#6bd0ee, #36b3d9); + background-image: linear-gradient(#6bd0ee, #36b3d9); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #2396b9 #2396b9 #1f85a4; + border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125); } -.alert-message .close { +.close { float: right; margin-top: -2px; - color: #000; + color: #000000; font-size: 20px; font-weight: bold; text-shadow: 0 1px 0 #ffffff; @@ -1412,56 +1429,40 @@ footer { -moz-opacity: 0.2; opacity: 0.2; } -.alert-message .close:hover { +.close:hover { + color: #000000; text-decoration: none; filter: alpha(opacity=40); -khtml-opacity: 0.4; -moz-opacity: 0.4; opacity: 0.4; } -.block-message { - margin-bottom: 18px; +.alert-block { + background-image: none; + background-color: #fdf5d9; 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; - border-radius: 6px; + border-color: #fceec1; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -.block-message p { - color: #404040; - color: rgba(0, 0, 0, 0.8); - *color: #404040; - /* IE 6-7 */ - +.alert-block p { margin-right: 30px; - margin-bottom: 0; } -.block-message ul { - margin-bottom: 0; -} -.block-message strong { - display: block; -} -.block-message.error { - background: #f8dcda; - border: 1px solid #f4c8c5; +.alert-block .alert-actions { + margin-top: 5px; } -.block-message.warning { - background: #fff0c0; - border: 1px solid #ffe38d; +.alert-block.error { + background-color: #fddfde; + border-color: #fbc7c6; } -.block-message.success { - background: #dff1df; - border: 1px solid #bbe2bb; +.alert-block.success { + background-color: #d1eed1; + border-color: #bfe7bf; } -.block-message.info { - background: #c7eefe; - border: 1px solid #ade6fe; +.alert-block.info { + background-color: #ddf4fb; + border-color: #c6edf9; } .tabs, .pills { margin: 0 0 20px; |
