Merge branch 'alert-headers' of https://github.com/jacobrask/bootstrap into jacobrask-alert-headers

Conflicts:
	docs/assets/bootstrap.zip

3 files changed, 5 insertions, 25 deletions

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index cdbb2c88e..811291999 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 0875a146c..d880c288a 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2133,10 +2133,11 @@ button.btn.small, input[type="submit"].btn.small {
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
-}
-.alert, .alert-heading {
   color: #c09853;
 }
+.alert-heading {
+  color: inherit;
+}
 .alert .close {
   position: relative;
   top: -2px;
@@ -2146,25 +2147,16 @@ button.btn.small, input[type="submit"].btn.small {
 .alert-success {
   background-color: #dff0d8;
   border-color: #d6e9c6;
-}
-.alert-success, .alert-success .alert-heading {
   color: #468847;
 }
 .alert-danger, .alert-error {
   background-color: #f2dede;
   border-color: #eed3d7;
-}
-.alert-danger,
-.alert-error,
-.alert-danger .alert-heading,
-.alert-error .alert-heading {
   color: #b94a48;
 }
 .alert-info {
   background-color: #d9edf7;
   border-color: #bce8f1;
-}
-.alert-info, .alert-info .alert-heading {
   color: #3a87ad;
 }
 .alert-block {
diff --git a/less/alerts.less b/less/alerts.less
index 562826fd3..46a0d77bf 100644
--- a/less/alerts.less
+++ b/less/alerts.less
@@ -9,10 +9,10 @@
   background-color: @warningBackground;
   border: 1px solid @warningBorder;
   .border-radius(4px);
+  color: @warningText;
 }
-.alert,
 .alert-heading {
-  color: @warningText;
+  color: inherit;
 }
 
 // Adjust close link position
@@ -29,32 +29,20 @@
 .alert-success {
   background-color: @successBackground;
   border-color: @successBorder;  
-}
-.alert-success,
-.alert-success .alert-heading {
   color: @successText;
 }
 .alert-danger,
 .alert-error {
   background-color: @errorBackground;
   border-color: @errorBorder;
-}
-.alert-danger,
-.alert-error,
-.alert-danger .alert-heading,
-.alert-error .alert-heading {
   color: @errorText;
 }
 .alert-info {
   background-color: @infoBackground;
   border-color: @infoBorder;
-}
-.alert-info,
-.alert-info .alert-heading {
   color: @infoText;
 }
 
-
 // Block alerts
 // ------------------------
 .alert-block {