From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Sun, 22 Oct 2006 02:42:36 +0000 (+0000)
Subject: Fix common.css so that it loads correctly, remove inclusions of it from other CSS... 
X-Git-Tag: 1.31.0-rc.0~55405
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=ac1b1ef2534fdeee8988991e3a70b7bfa9186a29;p=lhc%2Fweb%2Fwiklou.git

Fix common.css so that it loads correctly, remove inclusions of it from other CSS files, bump style version.
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 1fec1aa634..d6033a865a 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1030,7 +1030,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '19';
+$wgStyleVersion = '20';
 
 # Server-side caching:
 
diff --git a/includes/Skin.php b/includes/Skin.php
index 72fa8a22fe..f349c39104 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -363,9 +363,8 @@ class Skin extends Linker {
 		global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage, $wgStyleVersion;
 		$sheet = $this->getStylesheet();
 		$action = $wgRequest->getText('action');
-		// fixme: the common.css import might be doubled now...
-		$s = "@import \"$wgStylePath/common.css?$wgStyleVersion\";\n";
-		$s = "@import \"$wgStylePath/$sheet?$wgStyleVersion\";\n";
+		$s = "@import \"$wgStylePath/common/common.css?$wgStyleVersion\";\n";
+		$s .= "@import \"$wgStylePath/$sheet?$wgStyleVersion\";\n";
 		if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css?$wgStyleVersion\";\n";
 
 		$query = "usemsgcache=yes&action=raw&ctype=text/css&smaxage=$wgSquidMaxage";
diff --git a/skins/common/cologneblue.css b/skins/common/cologneblue.css
index 1e27756731..8153d3c63b 100644
--- a/skins/common/cologneblue.css
+++ b/skins/common/cologneblue.css
@@ -1,5 +1,3 @@
-@import url("common.css?3");
-
 body { margin: 0px; padding: 0px; color: black; }
 #specialform { display: inline; }
 #content { top: 0; margin: 0; padding: 0; }
diff --git a/skins/common/nostalgia.css b/skins/common/nostalgia.css
index da0f2524bb..c9b36a70b0 100644
--- a/skins/common/nostalgia.css
+++ b/skins/common/nostalgia.css
@@ -1,4 +1,3 @@
-@import url("common.css?3");
 body {
 	/* Background color is set separately on page type */
 	color: black;
diff --git a/skins/common/wikistandard.css b/skins/common/wikistandard.css
index 2e18a8964b..532e4fdca8 100644
--- a/skins/common/wikistandard.css
+++ b/skins/common/wikistandard.css
@@ -1,5 +1,3 @@
-@import url("common.css?3");
-
 #article { padding: 4px; }
 #content { margin: 0; padding: 0; }
 #footer { padding: 4px;font-size:95%;clear: both; }