3 files changed, 15 insertions, 36 deletions
diff --git a/modules/system/system.css b/modules/system/system.css
index 3d8814ffd..0e0981415 100644
--- a/modules/system/system.css
+++ b/modules/system/system.css
@@ -64,39 +64,6 @@ thead th {
 .breadcrumb {
   padding-bottom: .5em
 }
-.error {
-  color: #e55;
-}
-div.error {
-  border: 1px solid #d77;
-}
-div.error, tr.error {
-  background: #fcc;
-  color: #200;
-  padding: 2px;
-}
-.warning {
-  color: #e09010;
-}
-div.warning {
-  border: 1px solid #f0c020;
-}
-div.warning, table tr.warning {
-  background: #ffd;
-  color: #220;
-  padding: 2px;
-}
-.ok {
-  color: #008000;
-}
-div.ok {
-  border: 1px solid #00aa00;
-}
-div.ok, tr.ok {
-  background: #dfd;
-  color: #020;
-  padding: 2px;
-}
 .item-list .icon {
   color: #555;
   float: right; /* LTR */
diff --git a/modules/system/system.module b/modules/system/system.module
index 7ea1d6599..5e65fd9e1 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1807,6 +1807,7 @@ function system_init() {
   drupal_add_css(drupal_get_path('module', 'system') . '/system.css', array('weight' => CSS_SYSTEM));
   drupal_add_css(drupal_get_path('module', 'system') . '/system-behavior.css', array('weight' => CSS_SYSTEM));
   drupal_add_css(drupal_get_path('module', 'system') . '/system-menus.css', array('weight' => CSS_SYSTEM));
+  drupal_add_css(drupal_get_path('module', 'system') . '/system-messages.css', array('weight' => CSS_SYSTEM));
 
 
   // Ignore slave database servers for this request.
diff --git a/themes/garland/style.css b/themes/garland/style.css
index 611512584..f188c5884 100644
--- a/themes/garland/style.css
+++ b/themes/garland/style.css
@@ -254,7 +254,7 @@ span.submitted, .description, .vertical-tab-button .summary {
   padding: .5em 1em;
 }
 
-.messages {
+div.messages {
   margin: .75em 0 .75em;
   padding: .1em .5em .15em;
 }
@@ -1096,7 +1096,7 @@ tr.taxonomy-term-divider-bottom {
 /**
  * Generic elements.
  */
-.messages {
+div.messages {
   background-color: #fff;
   border: 1px solid #b8d3e5;
 }
@@ -1107,8 +1107,13 @@ tr.taxonomy-term-divider-bottom {
 }
 
 div.status {
-  color: #33a333;
+  background-color: #fff;
   border-color: #c7f2c8;
+  color: #33a333;
+}
+
+div.error {
+  border: 1px solid #d77;
 }
 
 div.error, tr.error {
@@ -1116,6 +1121,12 @@ div.error, tr.error {
   background-color: #FFCCCC;
 }
 
+div.warning {
+  background-color: #ffd;
+  border: 1px solid #f0c020;
+  color: #220;
+}
+
 .form-item input.error, .form-item textarea.error {
   border: 1px solid #c52020;
   color: #363636;