From fe160261e460903cae251de25eaf41f236bd051e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jan 2012 11:30:24 -0800 Subject: [PATCH] normalize the alert classes to match last night's flip for form and table classes --- bootstrap.css | 26 +++++++++++++------------- bootstrap.min.css | 18 +++++++++--------- docs/components.html | 20 ++++++++++---------- lib/alerts.less | 32 ++++++++++++++++---------------- 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 7e2ba80237..c61c20987f 100644 --- a/bootstrap.css +++ b/bootstrap.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 Jan 15 00:04:02 PST 2012 + * Date: Sun Jan 15 11:29:00 PST 2012 */ html, body { margin: 0; @@ -2689,38 +2689,38 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-right: -21px; } -.success-alert { +.alert-success { background-color: #dff0d8; border-color: #cfe8c4; } -.success-alert, .success-alert .alert-heading { +.alert-success, .alert-success .alert-heading { color: #468847; } -.danger-alert, .error-alert { +.alert-danger, .alert-error { background-color: #f2dede; border-color: #e9c7c7; } -.danger-alert, -.error-alert, -.danger-alert .alert-heading, -.error-alert .alert-heading { +.alert-danger, +.alert-error, +.alert-danger .alert-heading, +.alert-error .alert-heading { color: #B94A48; } -.info-alert { +.alert-info { background-color: #d9edf7; border-color: #bfe1f2; } -.info-alert, .info-alert .alert-heading { +.alert-info, .alert-info .alert-heading { color: #3a87ad; } -.block-alert { +.alert-block { padding-top: 14px; padding-bottom: 14px; } -.block-alert > p, .block-alert > ul { +.alert-block > p, .alert-block > ul { margin-bottom: 0; } -.block-alert p + p { +.alert-block p + p { margin-top: 5px; } .thumbnails { diff --git a/bootstrap.min.css b/bootstrap.min.css index 6b55745ea7..ceec492dbd 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -481,15 +481,15 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .alert{position:relative;padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #f3edd2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .alert,.alert-heading{color:#c09853;} .alert>.close{*margin-top:3px;margin-right:-21px;} -.success-alert{background-color:#dff0d8;border-color:#cfe8c4;} -.success-alert,.success-alert .alert-heading{color:#468847;} -.danger-alert,.error-alert{background-color:#f2dede;border-color:#e9c7c7;} -.danger-alert,.error-alert,.danger-alert .alert-heading,.error-alert .alert-heading{color:#B94A48;} -.info-alert{background-color:#d9edf7;border-color:#bfe1f2;} -.info-alert,.info-alert .alert-heading{color:#3a87ad;} -.block-alert{padding-top:14px;padding-bottom:14px;} -.block-alert>p,.block-alert>ul{margin-bottom:0;} -.block-alert p+p{margin-top:5px;} +.alert-success{background-color:#dff0d8;border-color:#cfe8c4;} +.alert-success,.alert-success .alert-heading{color:#468847;} +.alert-danger,.alert-error{background-color:#f2dede;border-color:#e9c7c7;} +.alert-danger,.alert-error,.alert-danger .alert-heading,.alert-error .alert-heading{color:#B94A48;} +.alert-info{background-color:#d9edf7;border-color:#bfe1f2;} +.alert-info,.alert-info .alert-heading{color:#3a87ad;} +.alert-block{padding-top:14px;padding-bottom:14px;} +.alert-block>p,.alert-block>ul{margin-bottom:0;} +.alert-block p+p{margin-top:5px;} .thumbnails{margin-left:-20px;margin-bottom:0;list-style:none;zoom:1;}.thumbnails:before,.thumbnails:after{display:table;*display:inline;content:"";zoom:1;} .thumbnails:after{clear:both;} .thumbnails>li{float:left;margin:0 0 20px 20px;} diff --git a/docs/components.html b/docs/components.html index 83a0244565..c9390272d6 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1132,7 +1132,7 @@

Rewritten base class

With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outter <div>.

Single alert message

-

For a more durable component with less code, we've removed the differentiating look for block alerts, messages that com with more padding and typically more text. The class also has changed to .block-alert.

+

For a more durable component with less code, we've removed the differentiating look for block alerts, messages that com with more padding and typically more text. The class also has changed to .alert-block.

Goes great with javascript

Bootstrap comes with a great jQuery plugin that supports alert messages, making dismissing them quick and easy.

@@ -1151,14 +1151,14 @@ <strong>Warning!</strong> Best check yo self, you’re not looking too good. </div> -

Easily extend the standard alert message with two optional classes: .block-alert for more padding and text controls and .alert-heading for a matching heading.

-
+

Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.

+
×

Warning!

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.

-<div class="alert block-alert">
+<div class="alert alert-block">
   <a class="close">×</a>
   <h4 class="alert-heading">Warning!</h4>
   Best check yo self, you’re not...
@@ -1171,36 +1171,36 @@
   

     

       
Error or danger

-      

+      

         ×
         Oh snap! Change a few things up and try submitting again.
       

 
-<div class="alert error-alert">
+<div class="alert alert-error">
   ...
 </div>
 

     

     

       
Success

-      

+      

         ×
         Well done! You successfully read this important alert message.
       

 
-<div class="alert success-alert">
+<div class="alert alert-success">
   ...
 </div>
 

     

     

       
Information

-      

+      

         ×
         Heads up! This alert needs your attention, but it’s not super important.
       

 
-<div class="alert info-alert">
+<div class="alert alert-info">
   ...
 </div>
 

diff --git a/lib/alerts.less b/lib/alerts.less
index d1cd8addd5..a338f502a1 100644
--- a/lib/alerts.less
+++ b/lib/alerts.less
@@ -25,45 +25,45 @@
 // Alternate styles
 // ----------------
 
-.success-alert {
+.alert-success {
   background-color: #dff0d8;
   border-color: #cfe8c4;  
 }
-.success-alert,
-.success-alert .alert-heading {
+.alert-success,
+.alert-success .alert-heading {
   color: #468847;
 }
-.danger-alert,
-.error-alert {
+.alert-danger,
+.alert-error {
   background-color: #f2dede;
   border-color: #e9c7c7;
 }
-.danger-alert,
-.error-alert,
-.danger-alert .alert-heading,
-.error-alert .alert-heading {
+.alert-danger,
+.alert-error,
+.alert-danger .alert-heading,
+.alert-error .alert-heading {
   color: #B94A48;
 }
-.info-alert {
+.alert-info {
   background-color: #d9edf7;
   border-color: #bfe1f2;
 }
-.info-alert,
-.info-alert .alert-heading {
+.alert-info,
+.alert-info .alert-heading {
   color: #3a87ad;
 }
 
 
 // Block alerts
 // ------------------------
-.block-alert {
+.alert-block {
   padding-top: 14px;
   padding-bottom: 14px;
 }
-.block-alert > p,
-.block-alert > ul {
+.alert-block > p,
+.alert-block > ul {
   margin-bottom: 0;
 }
-.block-alert p + p {
+.alert-block p + p {
   margin-top: 5px;
 }
\ No newline at end of file