From: Timo Tijhof <ttijhof@wikimedia.org>
Date: Wed, 9 May 2012 00:08:04 +0000 (+0200)
Subject: (bug 36669) Installer CSS outdated
X-Git-Tag: 1.31.0-rc.0~23674^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=6540260001a0ec3b506a9ad4916712b4fe07b6bb;p=lhc%2Fweb%2Fwiklou.git

(bug 36669) Installer CSS outdated

Change-Id: I7ac606f2e8538eb5fd10a3944cf9d8b42bbc5ed5
---

diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php
index 972d8ac417..aabc1f36db 100644
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -116,9 +116,15 @@ class WebInstallerOutput {
 		// by '../skins/$skinName/images/', where $skinName is what appears
 		// before the last '/' in each of the strings.
 		$cssFileNames = array(
-			"common/shared.css",
-			"vector/screen.css",
-			"common/config.css",
+
+			// Basically the "skins.vector" ResourceLoader module styles
+			'common/commonElements.css',
+			'common/commonContent.css',
+			'common/commonInterface.css',
+			'vector/screen.css',
+
+			// mw-config specific
+			'common/config.css',
 		);
 
 		$css = '';
diff --git a/resources/Resources.php b/resources/Resources.php
index 909cb6e822..31d24d16bc 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -70,6 +70,7 @@ return array(
 		'localBasePath' => $GLOBALS['wgStyleDirectory'],
 	),
 	'skins.vector' => array(
+		// Keep in sync with WebInstallerOutput::getCSS()
 		'styles' => array(
 			'common/commonElements.css' => array( 'media' => 'screen' ),
 			'common/commonContent.css' => array( 'media' => 'screen' ),