From ce615d016a8ac380dae871358cfc7e745b5e20c2 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Thu, 25 Aug 2011 22:41:45 -0700
Subject: merged in my pending changes from 1.2-wip branch, resolve diffs as
 best as i could, update docs and alerts to use original classes, updated docs
 to include smaller section for layouts

---
 lib/preboot.less | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib/preboot.less')

diff --git a/lib/preboot.less b/lib/preboot.less
index 344876873..5191c5cc5 100644
--- a/lib/preboot.less
+++ b/lib/preboot.less
@@ -192,8 +192,7 @@
 // Shared colors for buttons and alerts
 
 .btn,
-.alert {
-
+.alert-message {
   &.danger,
   &.danger:hover,
   &.error,
@@ -217,7 +216,6 @@
   &.info {
     .gradientBar(#6bd0ee, #36b3d9);
   }
-
 }
 
 // Gradients
-- 
cgit v1.2.3