restore alerts, and make them suck much less

3 files changed, 6 insertions, 18 deletions

diff --git a/less/alerts.less b/less/alerts.less
index 34a830ce2..b76d81084 100644
--- a/less/alerts.less
+++ b/less/alerts.less
@@ -10,17 +10,15 @@
   padding: 8px 35px 8px 14px;
   margin-bottom: @line-height-base;
   text-shadow: 0 1px 0 rgba(255,255,255,.5);
+  color: @state-warning-text;
   background-color: @state-warning-background;
   border: 1px solid @state-warning-border;
   border-radius: @border-radius-base;
 }
-.alert,
 .alert h4 {
+  margin-top: 0;
   // Specified for the h4 to prevent conflicts of changing @headingsColor
-  color: @state-warning-text;
-}
-.alert h4 {
-  margin: 0;
+  color: inherit;
 }
 
 // Adjust close link position
@@ -29,9 +27,9 @@
   top: -2px;
   right: -21px;
   line-height: @line-height-base;
+  color: inherit;
 }
 
-
 // Alternate styles
 // -------------------------
 
@@ -40,28 +38,17 @@
   border-color: @state-success-border;
   color: @state-success-text;
 }
-.alert-success h4 {
-  color: @state-success-text;
-}
 .alert-danger,
 .alert-error {
   background-color: @state-error-background;
   border-color: @state-error-border;
   color: @state-error-text;
 }
-.alert-danger h4,
-.alert-error h4 {
-  color: @state-error-text;
-}
 .alert-info {
   background-color: @state-info-background;
   border-color: @state-info-border;
   color: @state-info-text;
 }
-.alert-info h4 {
-  color: @state-info-text;
-}
-
 
 // Block alerts
 // -------------------------
diff --git a/less/bootstrap.less b/less/bootstrap.less
index a0a2e868a..2fd0b8438 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -46,6 +46,7 @@
 @import "popovers.less";
 
 // Components: Misc
+@import "alerts.less";
 @import "thumbnails.less";
 @import "media.less";
 @import "badges.less";
diff --git a/less/close.less b/less/close.less
index d0403f93e..cda5a2467 100644
--- a/less/close.less
+++ b/less/close.less
@@ -15,7 +15,7 @@
     color: #000;
     text-decoration: none;
     cursor: pointer;
-    .opacity(40);
+    .opacity(50);
   }
 }