Skip to content
Browse files

updated classnames in the docs for the alerts, updated colors on erro…

…r and info alerts/buttons
  • Loading branch information...
1 parent 7d821f1 commit 0758f64045645849b21164149428719a005da1cb @mdo mdo committed Aug 25, 2011
Showing with 29 additions and 30 deletions.
  1. +19 −19 bootstrap-1.1.0.css
  2. +2 −2 bootstrap-1.1.0.min.css
  3. +2 −2 docs/index.html
  4. +6 −7 lib/preboot.less
View
38 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: Thu Aug 25 22:44:09 PDT 2011
+ * Date: Thu Aug 25 22:51:24 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).
@@ -143,17 +143,17 @@ aside {
.alert-message.danger,
.btn.error,
.alert-message.error {
- background-color: #d6463e;
+ background-color: #c43c35;
background-repeat: repeat-x;
- 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);
+ background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));
+ background-image: -moz-linear-gradient(#ee5f5b, #c43c35);
+ background-image: -ms-linear-gradient(#ee5f5b, #c43c35);
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));
+ background-image: -webkit-linear-gradient(#ee5f5b, #c43c35);
+ background-image: -o-linear-gradient(#ee5f5b, #c43c35);
+ background-image: linear-gradient(#ee5f5b, #c43c35);
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border-color: #d6463e #d6463e #a52a23;
+ border-color: #c43c35 #c43c35 #882a25;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
}
.btn.success, .alert-message.success {
@@ -171,17 +171,17 @@ aside {
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
}
.btn.info, .alert-message.info {
- background-color: #36b3d9;
+ background-color: #339bb9;
background-repeat: repeat-x;
- 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);
+ background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));
+ background-image: -moz-linear-gradient(#5bc0de, #339bb9);
+ background-image: -ms-linear-gradient(#5bc0de, #339bb9);
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));
+ background-image: -webkit-linear-gradient(#5bc0de, #339bb9);
+ background-image: -o-linear-gradient(#5bc0de, #339bb9);
+ background-image: linear-gradient(#5bc0de, #339bb9);
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border-color: #36b3d9 #36b3d9 #1f85a4;
+ border-color: #339bb9 #339bb9 #22697d;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
}
/*
View
4 bootstrap-1.1.0.min.css
@@ -10,9 +10,9 @@ header,section,footer,article,aside{display:block;}
.container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";}
.container:after{clear:both;}
.btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{color:#ffffff;}
-.btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#d6463e;background-repeat:repeat-x;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:#d6463e #d6463e #a52a23;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
+.btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));background-image:-moz-linear-gradient(#ee5f5b, #c43c35);background-image:-ms-linear-gradient(#ee5f5b, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(#ee5f5b, #c43c35);background-image:-o-linear-gradient(#ee5f5b, #c43c35);background-image:linear-gradient(#ee5f5b, #c43c35);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
.btn.success,.alert-message.success{background-color:#57a957;background-repeat:repeat-x;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:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
-.btn.info,.alert-message.info{background-color:#36b3d9;background-repeat:repeat-x;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:#36b3d9 #36b3d9 #1f85a4;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
+.btn.info,.alert-message.info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(#5bc0de, #339bb9);background-image:-ms-linear-gradient(#5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(#5bc0de, #339bb9);background-image:-o-linear-gradient(#5bc0de, #339bb9);background-image:linear-gradient(#5bc0de, #339bb9);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9 #22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
.row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";}
.row:after{clear:both;}
.row .span1,.row .span2,.row .span3,.row .span4,.row .span5,.row .span6,.row .span7,.row .span8,.row .span9,.row .span10,.row .span11,.row .span12,.row .span13,.row .span14,.row .span15,.row .span16{display:inline;float:left;margin-left:20px;}
View
4 docs/index.html
@@ -1064,7 +1064,7 @@
<div class="row">
<div class="span4 columns">
<h2>Basic alerts</h2>
- <p><code>div.alert</code></p>
+ <p><code>div.alert-message</code></p>
<p>One-line messages for highlighting the failure, possible failure, or success of an action. Particularly useful for forms.</p>
</div>
<div class="span12 columns">
@@ -1090,7 +1090,7 @@
<div class="row">
<div class="span4 columns">
<h2>Block messages</h2>
- <p><code>div.alert.alert-block</code></p>
+ <p><code>div.alert-message.block-message</code></p>
<p>For messages that require a bit of explanation, we have paragraph style alerts. These are perfect for bubbling up longer error messages, warning a user of a pending action, or just presenting information for more emphasis on the page.</p>
</div>
<div class="span12 columns">
View
13 lib/preboot.less
@@ -188,11 +188,10 @@
border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%);
border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
}
-
// Shared colors for buttons and alerts
-
.btn,
.alert-message {
+ // Set text color
&.danger,
&.danger:hover,
&.error,
@@ -203,18 +202,18 @@
&.info:hover {
color: @white
}
-
+ // Danger and error appear as red
&.danger,
&.error {
- .gradientBar(#f56a66, #d6463e);
+ .gradientBar(#ee5f5b, #c43c35);
}
-
+ // Success appears as green
&.success {
.gradientBar(#62c462, #57a957);
}
-
+ // Info appears as a neutral blue
&.info {
- .gradientBar(#6bd0ee, #36b3d9);
+ .gradientBar(#5bc0de, #339bb9);
}
}

0 comments on commit 0758f64

Please sign in to comment.
Something went wrong with that request. Please try again.