From d0b94ead9a660adeca599b2cc49ce5134d432f2f Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 2 Aug 2013 09:32:58 -0700
Subject: Fix #9008: consolidate `.alert-block` styles into `.alert`

---
 dist/css/bootstrap.css | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index e0862209e..22de1e417 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3751,7 +3751,7 @@ button.close {
 }
 
 .alert {
-  padding: 10px 35px 10px 15px;
+  padding: 15px 35px 15px 15px;
   margin-bottom: 20px;
   color: #c09853;
   background-color: #fcf8e3;
@@ -3780,6 +3780,15 @@ button.close {
   color: inherit;
 }
 
+.alert > p,
+.alert > ul {
+  margin-bottom: 0;
+}
+
+.alert > p + p {
+  margin-top: 5px;
+}
+
 .alert-success {
   color: #468847;
   background-color: #dff0d8;
@@ -3822,20 +3831,6 @@ button.close {
   color: #2d6987;
 }
 
-.alert-block {
-  padding-top: 15px;
-  padding-bottom: 15px;
-}
-
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
-}
-
-.alert-block p + p {
-  margin-top: 5px;
-}
-
 .thumbnail,
 .img-thumbnail {
   padding: 4px;
-- 
cgit v1.2.3