From a3959eccdf10613d21bb1f86047576fedcc13b0b Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Sun, 10 Jun 2007 17:16:54 +0000
Subject: [PATCH] Use shared.css as a common CSS file for all skins, and
 oldshared.css in place of common.css for pre-Monobook skins (avoiding
 "common" to reduce naming confusion with MediaWiki:Common.css).

---
 RELEASE-NOTES                              |  3 +++
 includes/Skin.php                          |  3 ++-
 skins/MonoBook.php                         |  5 ++++-
 skins/chick/main.css                       | 11 +----------
 skins/common/{common.css => oldshared.css} | 22 ++++------------------
 skins/common/shared.css                    |  9 +++++++++
 skins/monobook/handheld.css                | 11 +----------
 skins/monobook/main.css                    | 10 ----------
 skins/simple/main.css                      | 15 ---------------
 9 files changed, 24 insertions(+), 65 deletions(-)
 rename skins/common/{common.css => oldshared.css} (95%)
 create mode 100644 skins/common/shared.css

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 23550ffb0b..1983ea29cc 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -76,6 +76,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   post-installation
 * (bug 10196) Add classes and dir="ltr" to the <pre>s on user CSS and JS pages
   (new classes: mw-user-css, mw-user-js)
+* Use shared.css for all skins and oldshared.css in place of common.css for
+  pre-Monobook skins.  As always, modifications should go in-wiki to MediaWiki:
+  Common.css and MediaWiki:Monobook.css.
 
 == Bugfixes since 1.10 ==
 
diff --git a/includes/Skin.php b/includes/Skin.php
index b46bcfd9a8..2626e33351 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -388,7 +388,8 @@ class Skin extends Linker {
 	function getUserStylesheet() {
 		global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage, $wgStyleVersion;
 		$sheet = $this->getStylesheet();
-		$s = "@import \"$wgStylePath/common/common.css?$wgStyleVersion\";\n";
+		$s = "@import \"$wgStylePath/common/shared.css?$wgStyleVersion\";\n";
+		$s .= "@import \"$wgStylePath/common/oldshared.css?$wgStyleVersion\";\n";
 		$s .= "@import \"$wgStylePath/$sheet?$wgStyleVersion\";\n";
 		if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css?$wgStyleVersion\";\n";
 
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index fc169e0c2a..ff5408f907 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -56,7 +56,10 @@ class MonoBookTemplate extends QuickTemplate {
 		<meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" />
 		<?php $this->html('headlinks') ?>
 		<title><?php $this->text('pagetitle') ?></title>
-		<style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?<?php echo $GLOBALS['wgStyleVersion'] ?>"; /*]]>*/</style>
+		<style type="text/css" media="screen,projection">/*<![CDATA[*/
+			@import "<?php $this->text('stylepath') ?>/common/shared.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";
+			@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";
+		/*]]>*/</style>
 		<link rel="stylesheet" type="text/css" <?php if(empty($this->data['printable']) ) { ?>media="print"<?php } ?> href="<?php $this->text('stylepath') ?>/common/commonPrint.css?<?php echo $GLOBALS['wgStyleVersion'] ?>" />
 		<link rel="stylesheet" type="text/css" media="handheld" href="<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/handheld.css?<?php echo $GLOBALS['wgStyleVersion'] ?>" />
 		<!--[if lt IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE50Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]-->
diff --git a/skins/chick/main.css b/skins/chick/main.css
index 117e0326b6..18f3b4a2fb 100644
--- a/skins/chick/main.css
+++ b/skins/chick/main.css
@@ -473,13 +473,4 @@ div.gallerytext {
 /* Recreating-deleted-page warning and log entries */
 div#mw-recreate-deleted-warn ul li {
 	font-size: 95%;
-}
-
-/**
- * Here is some stuff that's ACTUALLY COMMON TO ALL SKINS.
- * When the day comes, it can be moved to a *real* common.css.
- */
-.mw-plusminus-null { color: #aaa; }
-.texvc { direction: ltr; unicode-bidi: embed; }
-/* Stop floats from intruding into edit area in previews */
-#toolbar, #wpTextbox1 { clear: both; }
+}
\ No newline at end of file
diff --git a/skins/common/common.css b/skins/common/oldshared.css
similarity index 95%
rename from skins/common/common.css
rename to skins/common/oldshared.css
index 29080f4bdb..14e6405d24 100644
--- a/skins/common/common.css
+++ b/skins/common/oldshared.css
@@ -1,6 +1,7 @@
 /*
- * common.css
- * This file contains CSS settings common to Wikistandard, Nostalgia and CologneBlue
+ * oldshared.css
+ * This file contains CSS settings common to Wikistandard, Nostalgia and
+ * CologneBlue, the old pre-Monobook skins
  */
 
 /* For clarity, explicitly state some recommendations from <http://www.w3.org/
@@ -456,20 +457,7 @@ div#mw-recreate-deleted-warn ul li {
 	font-size: 95%;
 }
 
-/**
- * Here is some stuff that's ACTUALLY COMMON TO ALL SKINS.
- * When the day comes, it can be moved to a *real* common.css.
- */
-.mw-plusminus-null { color: #aaa; }
-.texvc { direction: ltr; unicode-bidi: embed; }
-/* Stop floats from intruding into edit area in previews */
-#toolbar, #wpTextbox1 { clear: both; }
 
-/*
-#file img, .gallerybox .thumb img {
-	background: url(images/Checker-16x16.png) repeat;
-}
-*/
 .MediaTransformError {
 	border: thin solid #777;
 	background-color: #ccc;
@@ -479,6 +467,4 @@ div#mw-recreate-deleted-warn ul li {
 	text-align: center;
 	vertical-align: middle;
 	font-size: 90%;
-}
-
-
+}
\ No newline at end of file
diff --git a/skins/common/shared.css b/skins/common/shared.css
new file mode 100644
index 0000000000..f11893e78c
--- /dev/null
+++ b/skins/common/shared.css
@@ -0,0 +1,9 @@
+/**
+ * CSS in this file is used by *all* skins (that have any CSS at all).  Be
+ * careful what you put in here, since what looks good in one skin may not in
+ * another, but don't ignore the poor non-Monobook users either.
+ */
+.mw-plusminus-null { color: #aaa; }
+.texvc { direction: ltr; unicode-bidi: embed; }
+/* Stop floats from intruding into edit area in previews */
+#toolbar, #wpTextbox1 { clear: both; }
\ No newline at end of file
diff --git a/skins/monobook/handheld.css b/skins/monobook/handheld.css
index 5322bab51e..8f77c96995 100644
--- a/skins/monobook/handheld.css
+++ b/skins/monobook/handheld.css
@@ -1299,13 +1299,4 @@ tr.sv-space td { display: none; }
 		/* Kill big bulky stuff that will clog up the screen */
 		display: none;
 	}
-}
-
-/**
- * Here is some stuff that's ACTUALLY COMMON TO ALL SKINS.
- * When the day comes, it can be moved to a *real* common.css.
- */
-.mw-plusminus-null { color: #aaa; }
-.texvc { direction: ltr; unicode-bidi: embed; }
-/* Stop floats from intruding into edit area in previews */
-#toolbar, #wpTextbox1 { clear: both; }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 1022f9cba3..7b8a08616c 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -1622,16 +1622,6 @@ div#mw-recreate-deleted-warn {
 div#mw-recreate-deleted-warn ul li {
 	font-size: 90%;
 }
-
-/**
- * Here is some stuff that's ACTUALLY COMMON TO ALL SKINS.
- * When the day comes, it can be moved to a *real* common.css.
- */
-.mw-plusminus-null { color: #aaa; }
-.texvc { direction: ltr; unicode-bidi: embed; }
-/* Stop floats from intruding into edit area in previews */
-#toolbar, #wpTextbox1 { clear: both; }
-
 .MediaTransformError {
 	background-color: #ccc;
 	padding: 0.1em;
diff --git a/skins/simple/main.css b/skins/simple/main.css
index a539b4bca3..4dc0ea1382 100644
--- a/skins/simple/main.css
+++ b/skins/simple/main.css
@@ -449,18 +449,3 @@ div.mw-recreate-deleted-control {
 	float: right;
 	font-size: 90%;
 }
-
-/**
- * Here is some stuff that's ACTUALLY COMMON TO ALL SKINS.
- * When the day comes, it can be moved to a *real* common.css.
- */
-.mw-plusminus-null { color: #aaa; }
-.texvc { direction: ltr; unicode-bidi: embed; }
-/* Stop floats from intruding into edit area in previews */
-#toolbar, #wpTextbox1 { clear: both; }
-
-/*
-#file img, .gallerybox .thumb img {
-	background: url(../common/images/Checker-16x16.png) repeat;
-}
-*/
-- 
2.20.1