Add styling to flash

shyammohankanojia · Jan 12, 2012 · f526776 · f526776
1 parent 53ce976
commit f526776
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 23 deletions.
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -10,3 +10,6 @@
 
 @import "blueprint/reset";
 @import "blueprint";
+
+@import "lib/base";
+@import "partials/flash";
diff --git a/app/assets/stylesheets/layout.scss.erb b/app/assets/stylesheets/layout.scss.erb
@@ -54,18 +54,6 @@ body {
   }
 }
 
-/* *******************************/
-/* Flashes */
-/* *******************************/
-#error {
-  padding: 0 1em 1em;
-  color: red;
-
-  ul {
-    padding-left: 2em;
-  }
-}
-
 /* *******************************/
 /* Main Content */
 /* *******************************/

diff --git a/app/assets/stylesheets/partials/_flash.scss b/app/assets/stylesheets/partials/_flash.scss
@@ -0,0 +1,20 @@
+div#flash div.flash {
+  padding: 0.5em 1em;
+  @include rounded(4px);
+  background-color: #FDFAF2;
+  color: #555;
+
+  &.notice {
+    background-color: #8c8;
+    color: #252;
+  }
+
+  &.error, &.alert, &.warning {
+    background-color: #c88;
+    color: #522;
+  }
+
+  ul {
+    padding-left: 2em;
+  }
+}
diff --git a/app/views/login/_username_error.haml b/app/views/login/_username_error.haml
@@ -1,5 +1,7 @@
-#error
-  %p Warning: your username is currently empty or invalid.
-  %p
-    Please
-    %a{:href=>"/reset-username", :id=>"reset_username"}click here to reset your username.
+#flash
+  .flash.error
+    %p Warning: your username is currently empty or invalid.
+    %p
+      Please
+      %a{:href=>"/reset-username", :id=>"reset_username"}
+        click here to reset your username.
diff --git a/app/views/shared/_flash.haml b/app/views/shared/_flash.haml
@@ -1,6 +1,4 @@
-- if flash[:notice]
-  #flash
-    = flash[:notice]
-- if flash[:error]
-  #error
-    = flash[:error]
+#flash
+  - flash.each do |flashtype, message|
+    %div{:class => "flash #{flashtype}"}
+      = message