From ebaed675110376aa71f0c3b98760a6bdbfcfefd3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Sun, 31 Aug 2014 02:48:07 +0200 Subject: [PATCH] Move mediawiki.skinning.* modules from skins/common/ to resources/ MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is a BREAKING CHANGE, as we have used the names of these three files in skins/common/ as a "public API" for skins for a long time. Doing so has been deprecated (but still supported) in 1.23. We must clear them out at some point, and now is as good a time as ever, with the 1.23 LTS release still supporting the old way. Skins may no longer rely on the presence of commonElements.css, commonContent.css and commonInterface.css in skins/common/ and include them in their style modules. The corresponding ResourceLoader modules must be used instead: - skins/common/commonElements.css → 'mediawiki.skinning.elements' module - skins/common/commonContent.css → 'mediawiki.skinning.content' module - skins/common/commonInterface.css → 'mediawiki.skinning.interface' module Follow-up to I3947eaac (where I said I intend to do this) and I56758908. Bug: 69277 Change-Id: Id8456c570ff406822a8befad8f42f528ef5bd3a6 --- RELEASE-NOTES-1.24 | 7 ++++++ resources/Resources.php | 20 ++++++------------ .../src/mediawiki.skinning/content.css | 0 .../src/mediawiki.skinning/elements.css | 0 .../images/magnify-clip-ltr.png | Bin .../images/magnify-clip-rtl.png | Bin 0 -> 149 bytes .../src/mediawiki.skinning/interface.css | 0 7 files changed, 14 insertions(+), 13 deletions(-) rename skins/common/commonContent.css => resources/src/mediawiki.skinning/content.css (100%) rename skins/common/commonElements.css => resources/src/mediawiki.skinning/elements.css (100%) rename {skins/common => resources/src/mediawiki.skinning}/images/magnify-clip-ltr.png (100%) create mode 100644 resources/src/mediawiki.skinning/images/magnify-clip-rtl.png rename skins/common/commonInterface.css => resources/src/mediawiki.skinning/interface.css (100%) diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index c13ea9dd24..2ac3710109 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -355,6 +355,13 @@ changes to languages because of Bugzilla reports. the "headelement" template key are no longer supported. Setting $useHeadElement = false; is no longer supported and will not cause old keys like "headlinks", "skinnameclass", etc. to be defined. +* BREAKING CHANGE: The files commonElements.css, commonContent.css and + commonInterface.css (in skins/common/) have been removed. Skins may no longer + rely on their presence and include them in their style modules. ResourceLoader + modules introduced in MediaWiki 1.23 should be loaded instead: + - skins/common/commonElements.css → 'mediawiki.skinning.elements' module + - skins/common/commonContent.css → 'mediawiki.skinning.content' module + - skins/common/commonInterface.css → 'mediawiki.skinning.interface' module * The deprecated 'SpecialVersionExtensionTypes' hook was removed. * (bug 63891) Add 'X-Robots-Tag: noindex' header in action=render pages. * SpecialPage no longer supports the syntax for invoking wfSpecial*() functions. diff --git a/resources/Resources.php b/resources/Resources.php index eb36ee5341..946f3c9463 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -83,33 +83,27 @@ return array( */ 'mediawiki.skinning.elements' => array( 'styles' => array( - 'commonElements.css' => array( 'media' => 'screen' ), + 'resources/src/mediawiki.skinning/elements.css' => array( 'media' => 'screen' ), ), - 'remoteSkinPath' => 'common', - 'localBasePath' => $GLOBALS['wgStyleDirectory'] . '/common', ), 'mediawiki.skinning.content' => array( 'styles' => array( - 'commonElements.css' => array( 'media' => 'screen' ), - 'commonContent.css' => array( 'media' => 'screen' ), + 'resources/src/mediawiki.skinning/elements.css' => array( 'media' => 'screen' ), + 'resources/src/mediawiki.skinning/content.css' => array( 'media' => 'screen' ), ), - 'remoteSkinPath' => 'common', - 'localBasePath' => $GLOBALS['wgStyleDirectory'] . '/common', ), 'mediawiki.skinning.interface' => array( // Used in the web installer. Test it after modifying this definition! 'styles' => array( - 'commonElements.css' => array( 'media' => 'screen' ), - 'commonContent.css' => array( 'media' => 'screen' ), - 'commonInterface.css' => array( 'media' => 'screen' ), + 'resources/src/mediawiki.skinning/elements.css' => array( 'media' => 'screen' ), + 'resources/src/mediawiki.skinning/content.css' => array( 'media' => 'screen' ), + 'resources/src/mediawiki.skinning/interface.css' => array( 'media' => 'screen' ), ), - 'remoteSkinPath' => 'common', - 'localBasePath' => $GLOBALS['wgStyleDirectory'] . '/common', ), 'mediawiki.skinning.content.parsoid' => array( // Style Parsoid HTML+RDFa output consistent with wikitext from PHP parser - // with the commonInterface.css styles; skinStyles should be used if your + // with the interface.css styles; skinStyles should be used if your // skin over-rides common content styling. 'skinStyles' => array( 'default' => 'resources/src/mediawiki.skinning/content.parsoid.less', diff --git a/skins/common/commonContent.css b/resources/src/mediawiki.skinning/content.css similarity index 100% rename from skins/common/commonContent.css rename to resources/src/mediawiki.skinning/content.css diff --git a/skins/common/commonElements.css b/resources/src/mediawiki.skinning/elements.css similarity index 100% rename from skins/common/commonElements.css rename to resources/src/mediawiki.skinning/elements.css diff --git a/skins/common/images/magnify-clip-ltr.png b/resources/src/mediawiki.skinning/images/magnify-clip-ltr.png similarity index 100% rename from skins/common/images/magnify-clip-ltr.png rename to resources/src/mediawiki.skinning/images/magnify-clip-ltr.png diff --git a/resources/src/mediawiki.skinning/images/magnify-clip-rtl.png b/resources/src/mediawiki.skinning/images/magnify-clip-rtl.png new file mode 100644 index 0000000000000000000000000000000000000000..ff85c077d805a6f2f20d7d5d8485111e00ebfb0d GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngj0VEh&bvhb=6jMo%UogY}=!r^OfjmD?7sn8e z=;VrR;(X`+{{KHeG5?#0M#f6E&(;5&51I!3xc~iKY}DTJ_r?}JJM%WLZvV7DpS3xiVM9ub?b`~IQ$Uj$JYD@<);T3K0RXb5Ht7HW literal 0 HcmV?d00001 diff --git a/skins/common/commonInterface.css b/resources/src/mediawiki.skinning/interface.css similarity index 100% rename from skins/common/commonInterface.css rename to resources/src/mediawiki.skinning/interface.css -- 2.20.1