From: MatmaRex <matma.rex@gmail.com>
Date: Thu, 5 Sep 2013 13:37:14 +0000 (+0200)
Subject: Backport information boxes' styles from vforms to shared CSS
X-Git-Tag: 1.31.0-rc.0~18359^2
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=0b539d7fa1fc312b3be6804a2e51713da86fefee;p=lhc%2Fweb%2Fwiklou.git

Backport information boxes' styles from vforms to shared CSS

They're obviously prettier and non-intrusive enough to fit old
interfaces. The colors are changed to more pastel ones and the general
size of the boxes is reduced.

Also remove unnecessary bolds on the informations on
Special:Preferences and Special:ChangePassword.

Change-Id: Ieae62db1a124261ae7f5bf67aced8b84cfbadd3d
---

diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index d6a75bac4c..1015409e71 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -512,6 +512,8 @@ changes to languages because of Bugzilla reports.
   to addModules() and made protected.
 * Methods WatchAction::doWatch and WatchAction::doUnwatch now return a Status
   object instead of a boolean.
+* Information boxes (CSS classes errorbox, warningbox, successbox) have been
+  made more subtle.
 
 == Compatibility ==
 
diff --git a/includes/specials/SpecialChangePassword.php b/includes/specials/SpecialChangePassword.php
index 129e9193c1..7fcab1939c 100644
--- a/includes/specials/SpecialChangePassword.php
+++ b/includes/specials/SpecialChangePassword.php
@@ -85,7 +85,7 @@ class SpecialChangePassword extends UnlistedSpecialPage {
 
 				if ( $user->isLoggedIn() ) {
 					$this->getOutput()->wrapWikiMsg(
-							"<div class=\"successbox\"><strong>\n$1\n</strong></div>",
+							"<div class=\"successbox\">\n$1\n</div>",
 							'changepassword-success'
 					);
 					$this->getOutput()->returnToMain();
diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index ce7a45b334..ecee0bb79f 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -57,7 +57,7 @@ class SpecialPreferences extends SpecialPage {
 
 		if ( $this->getRequest()->getCheck( 'success' ) ) {
 			$out->wrapWikiMsg(
-				"<div class=\"successbox mw-sp-pref-successbox\">\n$1\n</div>",
+				"<div class=\"successbox\">\n$1\n</div>",
 				'savedprefs'
 			);
 		}
diff --git a/resources/mediawiki.special/mediawiki.special.preferences.css b/resources/mediawiki.special/mediawiki.special.preferences.css
index d455b2135d..161efde30d 100644
--- a/resources/mediawiki.special/mediawiki.special.preferences.css
+++ b/resources/mediawiki.special/mediawiki.special.preferences.css
@@ -9,6 +9,3 @@
 /*
 .mw-email-authenticated .mw-input { }
 */
-.mw-sp-pref-successbox {
-	font-weight: bold;
-}
diff --git a/resources/mediawiki.special/mediawiki.special.vforms.css b/resources/mediawiki.special/mediawiki.special.vforms.css
index 9ffe11cfb1..768a9c6e16 100644
--- a/resources/mediawiki.special/mediawiki.special.vforms.css
+++ b/resources/mediawiki.special/mediawiki.special.vforms.css
@@ -33,28 +33,9 @@ section.mw-form-header {
 	font-size: 0.9em;
 	margin: 0 0 1em 0;
 	padding: 0.5em;
-	border: 1px solid;
 	word-wrap: break-word;
 }
 
-.mw-ui-vform .errorbox {
-	color: #cc0000;
-	border-color: #fac5c5;
-	background-color: #fae3e3;
-}
-
-.mw-ui-vform .warningbox {
-	color: #705000;
-	border-color: #fde29b;
-	background-color: #fdf1d1;
-}
-
-.mw-ui-vform .successbox {
-	color: #009000;
-	border-color: #b7fdb5;
-	background-color: #e1fddf;
-}
-
 /*
  * Override the right margin of the form to give space in case a benefits
  * column appears to the side.
diff --git a/skins/common/shared.css b/skins/common/shared.css
index 7cc58e3030..ac7265a8af 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -535,52 +535,57 @@ table.collapsed tr.collapsable {
 }
 
 /* success and error messages */
+.error,
+.warning,
 .success {
-	color: green;
 	font-size: larger;
 }
+.error {
+	color: #cc0000;
+}
 .warning {
-	color: #FFA500; /* orange */
-	font-size: larger;
+	color: #705000;
 }
-.error {
-	color: red;
-	font-size: larger;
+.success {
+	color: #009000;
 }
+
 .errorbox,
 .warningbox,
 .successbox {
-	font-size: larger;
-	border: 2px solid;
+	border: 1px solid;
 	padding: .5em 1em;
-	margin-bottom: 2em;
-	color: #000;
+	margin-bottom: 1em;
 	display: -moz-inline-block;
 	display: inline-block;
 	zoom: 1;
 	*display: inline;
 }
-.errorbox {
-	border-color: red;
-	background-color: #fff2f2;
-}
-.warningbox {
-	border-color: #FF8C00; /* darkorange */
-	background-color: #FFFFC0;
-}
-.successbox {
-	border-color: green;
-	background-color: #dfd;
-}
 .errorbox h2,
 .warningbox h2,
 .successbox h2 {
 	font-size: 1em;
+	color: inherit;
 	font-weight: bold;
 	display: inline;
 	margin: 0 .5em 0 0;
 	border: none;
 }
+.errorbox {
+	color: #cc0000;
+	border-color: #fac5c5;
+	background-color: #fae3e3;
+}
+.warningbox {
+	color: #705000;
+	border-color: #fde29b;
+	background-color: #fdf1d1;
+}
+.successbox {
+	color: #009000;
+	border-color: #b7fdb5;
+	background-color: #e1fddf;
+}
 
 /* general info/warning box for SP */
 .mw-infobox {