From 35ba4b58a754179c1555ca60c86891edb22bb13a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Sat, 30 May 2015 17:20:06 +0200 Subject: [PATCH] Tweak 'position' of 'mediawiki.skinning.*' modules mediawiki.skinning.elements: mediawiki.skinning.content: Add 'position' => 'top', like mediawiki.skinning.interface. Follow-up to d6b4d3c537fa5944c2f234213b20037fe3192d62. mediawiki.skinning.content.externallinks: Set 'position' => 'bottom', as this module only provides icons (and provides a ton of them), which can be loaded after initial load. Also tweaked some comments. Change-Id: Ib26afd6cbb2b5d4a7557c5c8243d2f7482a6f064 --- resources/Resources.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/resources/Resources.php b/resources/Resources.php index 1f5ac164ad..844f232b66 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -94,20 +94,22 @@ return array( * including more than one of them into your skin as this will result in duplicate CSS. */ 'mediawiki.skinning.elements' => array( + 'position' => 'top', 'styles' => array( 'resources/src/mediawiki.skinning/elements.css' => array( 'media' => 'screen' ), ), ), 'mediawiki.skinning.content' => array( + 'position' => 'top', 'styles' => array( 'resources/src/mediawiki.skinning/elements.css' => array( 'media' => 'screen' ), 'resources/src/mediawiki.skinning/content.css' => array( 'media' => 'screen' ), ), ), + // Used in the web installer. Test it after modifying this definition! 'mediawiki.skinning.interface' => array( 'position' => 'top', 'class' => 'ResourceLoaderSkinModule', - // Used in the web installer. Test it after modifying this definition! 'styles' => array( 'resources/src/mediawiki.skinning/elements.css' => array( 'media' => 'screen' ), 'resources/src/mediawiki.skinning/content.css' => array( 'media' => 'screen' ), @@ -127,7 +129,7 @@ return array( ), 'mediawiki.skinning.content.externallinks' => array( - 'position' => 'top', + 'position' => 'bottom', 'styles' => array( 'resources/src/mediawiki.skinning/content.externallinks.css' => array( 'media' => 'screen' ), ), @@ -1600,8 +1602,8 @@ return array( /* MediaWiki Installer */ + // Used in the web installer. Test it after modifying this definition! 'mediawiki.legacy.config' => array( - // Used in the web installer. Test it after modifying this definition! // These files are not actually loaded via ResourceLoader, so dependencies etc. won't work. 'scripts' => 'mw-config/config.js', 'styles' => 'mw-config/config.css', @@ -1628,8 +1630,8 @@ return array( 'dependencies' => 'jquery.byteLimit', 'messages' => array( 'protect-unchain-permissions' ) ), + // Used in the web installer. Test it after modifying this definition! 'mediawiki.legacy.shared' => array( - // Used in the web installer. Test it after modifying this definition! 'position' => 'top', 'styles' => array( 'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' ) -- 2.20.1