diff --git a/bootstrap-1.1.0.css b/bootstrap-1.1.0.css
index ee0cc3fdfa2c700168cf3da238935a124780a617..246094daf9b8a1810bec830e65979e648c7acd45 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;
diff --git a/bootstrap-1.1.0.min.css b/bootstrap-1.1.0.min.css
index 9d7fa25e05544f5e448a004bc98b49f2379b47ca..5e273bf8e8a47943da7e1672437fc0a4326ec533 100644
--- a/bootstrap-1.1.0.min.css
+++ b/bootstrap-1.1.0.min.css
@@ -9,9 +9,9 @@ header,section,footer,article,aside{display:block;}
.center-block{display:block;margin:0 auto;}
.container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";}
.container:after{clear:both;}
-.row{zoom:1;margin:0 -20px;}.row:before,.row:after{display:table;content:"";}
+.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{float:left;margin-left:20px;*display:inline;}
+.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;}
.row .span1{width:40px;}
.row .span2{width:100px;}
.row .span3{width:160px;}
@@ -182,19 +182,20 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0
.hero-unit p{font-size:18px;font-weight:200;line-height:27px;}
footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;}
.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;}
-.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));background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";background-color:#e6e6e6;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);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.alert-message p{color:#fff;margin-bottom:0;}.alert-message p+p{margin-top:5px;}
-.alert-message.error{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;}
-.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;}
-.alert-message.success{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;}
-.alert-message.info{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;}
-.alert-message .close{float:right;margin-top:-2px;color:#000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.alert-message .close:hover{text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;}
-.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;}.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;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;}
-.block-message.warning{background:#fff0c0;border:1px solid #ffe38d;}
-.block-message.success{background:#dff1df;border:1px solid #bbe2bb;}
-.block-message.info{background:#c7eefe;border:1px solid #ade6fe;}
+.alert{background-color:#eedc94;background-repeat:repeat-x;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: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 h5{line-height:18px;}
+.alert p{margin-bottom:0;}
+.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-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:#ba2f27 #ba2f27 #a52a23;border-color:rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125);}
+.alert-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:#458845 #458845 #3d773d;border-color:rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125);}
+.alert-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:#2396b9 #2396b9 #1f85a4;border-color:rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125);}
+.close{float:right;margin-top:-2px;color:#000000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;}
+.alert-block{background-image:none;background-color:#fdf5d9;padding:14px;border-color:#fceec1;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.alert-block p{margin-right:30px;}
+.alert-block .alert-actions{margin-top:5px;}
+.alert-block.error{background-color:#fddfde;border-color:#fbc7c6;}
+.alert-block.success{background-color:#d1eed1;border-color:#bfe7bf;}
+.alert-block.info{background-color:#ddf4fb;border-color:#c6edf9;}
.tabs,.pills{margin:0 0 20px;padding:0;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
.tabs:after,.pills:after{clear:both;}
.tabs li,.pills li{display:inline;}.tabs li a,.pills li a{float:left;width:auto;}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index b7d241994b21b436bf842a8fd3b2741b126c9d85..8334d3f12fd3283f4166f6c33f7511d1266b9932 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -13,6 +13,9 @@ body {
section {
padding-top: 60px;
}
+section > .row {
+ margin-bottom: 10px;
+}
#masthead, #footer {
background-color: #049cd9;
background-repeat: no-repeat;
diff --git a/docs/index.html b/docs/index.html
index 503be111b9b4e9142f864e1330bb243b18a6b825..ebaa5a6f3a74d8ceaf45c40fc6c2a2defe8aaba3 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1069,22 +1069,23 @@
<div class="row">
<div class="span4 columns">
<h2>Basic alerts</h2>
+ <p><code>div.alert</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">
- <div class="alert-message error">
+ <div class="alert">
<a class="close" href="#">×</a>
<p><strong>Oh snap!</strong> Change this and that and try again.</p>
</div>
- <div class="alert-message warning">
+ <div class="alert alert-error">
<a class="close" href="#">×</a>
<p><strong>Holy gaucamole!</strong> Best check yo self, you’re not looking too good.</p>
</div>
- <div class="alert-message success">
+ <div class="alert alert-success">
<a class="close" href="#">×</a>
<p><strong>Well done!</strong> You successfully read this alert message.</p>
</div>
- <div class="alert-message info">
+ <div class="alert alert-info">
<a class="close" href="#">×</a>
<p><strong>Heads up!</strong> This is an alert that needs your attention, but it’s not a huge priority just yet.</p>
</div>
@@ -1094,28 +1095,37 @@
<div class="row">
<div class="span4 columns">
<h2>Block messages</h2>
+ <p><code>div.alert.alert-block</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">
- <div class="alert-message block-message error">
+ <div class="alert alert-block">
<a class="close" href="#">×</a>
<p><strong>Oh snap! You got an error!</strong> Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.</p>
- <p><a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a></p>
+ <div class="alert-actions">
+ <a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a>
+ </div>
</div>
- <div class="alert-message block-message warning">
+ <div class="alert alert-block error">
<a class="close" href="#">×</a>
<p><strong>Holy gaucamole! This is a warning!</strong> Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
- <p><a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a></p>
+ <div class="alert-actions">
+ <a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a>
+ </div>
</div>
- <div class="alert-message block-message success">
+ <div class="alert alert-block success">
<a class="close" href="#">×</a>
<p><strong>Well done!</strong> You successfully read this alert message. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Maecenas faucibus mollis interdum.</p>
- <p><a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a></p>
+ <div class="alert-actions">
+ <a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a>
+ </div>
</div>
- <div class="alert-message block-message info">
+ <div class="alert alert-block info">
<a class="close" href="#">×</a>
<p><strong>Heads up!</strong> This is an alert that needs your attention, but it’s not a huge priority just yet.</p>
- <p><a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a></p>
+ <div class="alert-actions">
+ <a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a>
+ </div>
</div>
</div>
</div> <!-- /row -->
@@ -1234,7 +1244,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
<h2>What’s included</h2>
<p>Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.</p>
- <h3>Color variables</h3>
+ <h3>Variables</h3>
<p>Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.</p>
<pre class="prettyprint linenums">
// Links
@@ -1258,8 +1268,9 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
@pink: #c3325f;
@purple: #7a43b6;
-// Baseline
-@baseline: 20px;
+// Baseline grid
+@basefont: 13px;
+@baseline: 18px;
</pre>
<h3>Commenting</h3>
@@ -1311,8 +1322,6 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
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) {
@@ -1324,14 +1333,12 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
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) {
...
}
- .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 0.5, @endColor: #c3325f) {
+ .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
...
}
}
@@ -1344,6 +1351,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
@gridColumns: 16;
@gridColumnWidth: 40px;
@gridGutterWidth: 20px;
+@siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
// Grid System
.container {
@@ -1352,16 +1360,10 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
.clearfix();
}
.columns(@columnSpan: 1) {
- display: inline;
- float: left;
width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
- margin-left: @gridGutterWidth;
- &:first-child {
- margin-left: 0;
- }
}
.offset(@columnOffset: 1) {
- margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) !important;
+ margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @extraSpace;
}
</pre>
</div>
diff --git a/lib/patterns.less b/lib/patterns.less
index ec42b033c1b0073993d2314322efe0362776f3e4..466727cc42b58292646246eca5650ed9ff1c0ad5 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -292,95 +292,96 @@ footer {
// ERROR STYLES
// ------------
-// One-liner alert bars
-.alert-message {
- // TODO: Ask cloudhead how to do this fancy filter elegantly. Less eval is returning strings with quotes ;_;
- #gradient > .vertical(transparent, rgba(0,0,0,0.15));
- filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";
- background-color: @grayLighter;
- margin-bottom: @baseline;
- padding: 8px 15px;
- color: #fff;
- 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;
- margin-bottom: 0;
- + p {
- margin-top: 5px;
- }
- }
- &.error {
- #gradient > .vertical(lighten(@red, 30%), lighten(@red, 15%));
- border-bottom-color: lighten(@red, 5%);
- }
- &.warning {
- #gradient > .vertical(lighten(@yellow, 25%), lighten(@yellow, 10%));
- border-bottom-color: @yellow;
- }
- &.success {
- #gradient > .vertical(lighten(@green, 25%), lighten(@green, 10%));
- border-bottom-color: @green;
- }
- &.info {
- #gradient > .vertical(lighten(@blue, 25%), lighten(@blue, 5%));
- border-bottom-color: @blue;
- }
- .close {
- float: right;
- margin-top: -2px;
- color: #000;
- font-size: 20px;
- font-weight: bold;
- text-shadow: 0 1px 0 rgba(255,255,255,1);
- .opacity(20);
- &:hover {
- text-decoration: none;
- .opacity(40);
- }
- }
+// Setup a mixin to colorize different alerts
+.alertTheme(@primaryColor, @secondaryColor) {
+ #gradient > .vertical(@primaryColor, @secondaryColor);
+ text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+ border-color: darken(@secondaryColor, 10%) darken(@secondaryColor, 10%) darken(@secondaryColor, 15%);
+ border-color: rgba(0,0,0,.05) rgba(0,0,0,.075) rgba(0,0,0,.125);
}
-// Block-level Alerts
-.block-message {
+// Base alert styles
+.alert {
+ .alertTheme(#fceec1, #eedc94);
margin-bottom: @baseline;
- padding: 14px;
+ padding: 7px 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;
+ text-shadow: 0 1px 0 rgba(255,255,255,.5);
+ border-width: 1px;
+ border-style: solid;
+ .border-radius(4px);
+ .box-shadow(inset 0 1px 0 rgba(255,255,255,.25));
+ // Remove extra margin from content
+ h5 {
+ line-height: @baseline;
}
- ul {
+ p {
margin-bottom: 0;
}
- strong {
- display: block;
+ div {
+ margin-top: 5px;
+ margin-bottom: 2px;
+ line-height: 28px;
}
- &.error {
- background: lighten(@red, 55%);
- border: 1px solid lighten(@red, 50%);
+ // Provide actions with buttons
+ .btn {
+ .box-shadow(0 1px 0 rgba(255,255,255,.25));
}
- &.warning {
- background: lighten(@yellow, 35%);
- border: 1px solid lighten(@yellow, 25%)
+}
+// Alternate alerts
+.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,.3);
+}
+.alert-error { .alertTheme(#f56a66, #d6463e); }
+.alert-success { .alertTheme(#62c462, #57a957); }
+.alert-info { .alertTheme(#6bd0ee, #36b3d9); }
+// Close action
+.close {
+ float: right;
+ margin-top: -2px;
+ color: @black;
+ font-size: 20px;
+ font-weight: bold;
+ text-shadow: 0 1px 0 rgba(255,255,255,1);
+ .opacity(20);
+ &:hover {
+ color: @black;
+ text-decoration: none;
+ .opacity(40);
}
- &.success {
- background: lighten(@green, 45%);
- border: 1px solid lighten(@green, 35%)
+}
+// Block-level alerts
+.alert-block {
+ background-image: none;
+ background-color: lighten(#fceec1, 5%);
+ padding: 14px;
+ border-color: #fceec1;
+ .box-shadow(none);
+ p {
+ margin-right: 30px;
}
- &.info {
- background: lighten(@blue, 45%);
- border: 1px solid lighten(@blue, 40%);
+ .alert-actions {
+ margin-top: 5px;
}
}
+.alert-block.error {
+ background-color: lighten(#f56a66, 25%);
+ border-color: lighten(#f56a66, 20%);
+}
+.alert-block.success {
+ background-color: lighten(#62c462, 30%);
+ border-color: lighten(#62c462, 25%);
+}
+.alert-block.info {
+ background-color: lighten(#6bd0ee, 25%);
+ border-color: lighten(#6bd0ee, 20%);
+}
// NAVIGATION
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 5dc054f93b033167318d8325d4b56d3dc5b02d1b..f5bc68868cf7440eb91ca30bccf6a23819332689 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -9,7 +9,7 @@
.row {
.clearfix();
- margin: 0 -20px;
+ margin-left: -20px;
// Default columns
.span1,
@@ -28,9 +28,9 @@
.span14,
.span15,
.span16 {
+ display: inline;
float: left;
margin-left: 20px;
- *display: inline; // IE6 double margin bug fix.
}
// Default columns