X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=resources%2FResources.php;h=68dc984f7299ac94bcba317d74d86725469d8f61;hb=c7a197d58fd27e538ebdcd8d14e2ec9f9e2bc4f7;hp=df124cc18019fde86a3bdce7431cb747998ff09a;hpb=5c5255e227c3a9b6c5a3508d488423907f725040;p=lhc%2Fweb%2Fwiklou.git diff --git a/resources/Resources.php b/resources/Resources.php index df124cc180..68dc984f72 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -50,6 +50,59 @@ return array( // Scripts for the dynamic language specific data, like grammar forms. 'mediawiki.language.data' => array( 'class' => 'ResourceLoaderLanguageDataModule' ), + /** + * Common skin styles, grouped into three graded levels. + * + * Level 1 "elements": + * The base level that only contains the most basic of common skin styles. + * Only styles for single elements are included, no styling for complex structures like the TOC + * is present. This level is for skins that want to implement the entire style of even content area + * structures like the TOC themselves. + * + * Level 2 "content": + * The most commonly used level for skins implemented from scratch. This level includes all the single + * element styles from "elements" as well as styles for complex structures such as the TOC that are output + * in the content area by MediaWiki rather than the skin. Essentially this is the common level that lets + * skins leave the style of the content area as it is normally styled, while leaving the rest of the skin + * up to the skin implementation. + * + * Level 3 "interface": + * The highest level, this stylesheet contains extra common styles for classes like .firstHeading, #contentSub, + * et cetera which are not outputted by MediaWiki but are common to skins like MonoBook, Vector, etc... + * Essentially this level is for styles that are common to MonoBook clones. And since practically every skin + * that currently exists within core is a MonoBook clone, all our core skins currently use this level. + * + * These modules are typically loaded by addModuleStyles which has absolutely no concept of dependency + * management. As a result the skins.common.* modules contain duplicate stylesheet references instead of + * setting 'dependencies' to the lower level the module is based on. For this reason avoid including multiple + * skins.common.* modules into your skin as this will result in duplicate css. + */ + 'skins.common.elements' => array( + 'styles' => array( + 'common/commonElements.css' => array( 'media' => 'screen' ), + ), + 'remoteBasePath' => $GLOBALS['wgStylePath'], + 'localBasePath' => $GLOBALS['wgStyleDirectory'], + ), + 'skins.common.content' => array( + 'styles' => array( + 'common/commonElements.css' => array( 'media' => 'screen' ), + 'common/commonContent.css' => array( 'media' => 'screen' ), + ), + 'remoteBasePath' => $GLOBALS['wgStylePath'], + 'localBasePath' => $GLOBALS['wgStyleDirectory'], + ), + 'skins.common.interface' => array( + // Used in the web installer. Test it after modifying this definition! + 'styles' => array( + 'common/commonElements.css' => array( 'media' => 'screen' ), + 'common/commonContent.css' => array( 'media' => 'screen' ), + 'common/commonInterface.css' => array( 'media' => 'screen' ), + ), + 'remoteBasePath' => $GLOBALS['wgStylePath'], + 'localBasePath' => $GLOBALS['wgStyleDirectory'], + ), + /** * Skins * Be careful not to add 'scripts' to these modules, @@ -76,6 +129,7 @@ return array( 'remoteBasePath' => $GLOBALS['wgStylePath'], 'localBasePath' => $GLOBALS['wgStyleDirectory'], ), + // FIXME: Remove in favour of skins.monobook.styles when cache expires 'skins.monobook' => array( 'styles' => array( 'common/commonElements.css' => array( 'media' => 'screen' ), @@ -86,8 +140,8 @@ return array( 'remoteBasePath' => $GLOBALS['wgStylePath'], 'localBasePath' => $GLOBALS['wgStyleDirectory'], ), + // FIXME: Remove in favour of skins.vector.styles when cache expires 'skins.vector' => array( - // Used in the web installer. Test it after modifying this definition! 'styles' => array( 'common/commonElements.css' => array( 'media' => 'screen' ), 'common/commonContent.css' => array( 'media' => 'screen' ), @@ -97,13 +151,17 @@ return array( 'remoteBasePath' => $GLOBALS['wgStylePath'], 'localBasePath' => $GLOBALS['wgStyleDirectory'], ), - 'skins.vector.beta' => array( - // Keep in sync with skins.vector + 'skins.vector.styles' => array( + // Used in the web installer. Test it after modifying this definition! 'styles' => array( - 'common/commonElements.css' => array( 'media' => 'screen' ), - 'common/commonContent.css' => array( 'media' => 'screen' ), - 'common/commonInterface.css' => array( 'media' => 'screen' ), - 'vector/styles-beta.less', + 'vector/styles.less', + ), + 'remoteBasePath' => $GLOBALS['wgStylePath'], + 'localBasePath' => $GLOBALS['wgStyleDirectory'], + ), + 'skins.monobook.styles' => array( + 'styles' => array( + 'monobook/main.css' => array( 'media' => 'screen' ), ), 'remoteBasePath' => $GLOBALS['wgStylePath'], 'localBasePath' => $GLOBALS['wgStyleDirectory'], @@ -1013,6 +1071,13 @@ return array( 'mediawiki.special.changeslist' => array( 'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.css', ), + 'mediawiki.special.changeslist.js' => array( + 'scripts' => 'resources/mediawiki.special/mediawiki.special.changeslist.js', + 'dependencies' => array( + 'jquery.makeCollapsible', + 'jquery.cookie', + ), + ), 'mediawiki.special.changeslist.enhanced' => array( 'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css', ), @@ -1030,6 +1095,9 @@ return array( 'skinStyles' => array( 'vector' => 'skins/vector/special.preferences.less', ), + 'messages' => array( + 'prefs-tabs-navigation-hint', + ), ), 'mediawiki.special.recentchanges' => array( 'scripts' => 'resources/mediawiki.special/mediawiki.special.recentchanges.js', @@ -1064,28 +1132,39 @@ return array( 'mediawiki.util', ), ), - 'mediawiki.special.userlogin' => array( + 'mediawiki.special.userlogin.common.styles' => array( 'styles' => array( - 'resources/mediawiki.special/mediawiki.special.vforms.css', - 'resources/mediawiki.special/mediawiki.special.userLogin.css', + 'resources/mediawiki.special/mediawiki.special.userlogin.common.css', ), 'position' => 'top', ), - 'mediawiki.special.createaccount' => array( + 'mediawiki.special.userlogin.signup.styles' => array( 'styles' => array( - 'resources/mediawiki.special/mediawiki.special.vforms.css', - 'resources/mediawiki.special/mediawiki.special.createAccount.css', + 'resources/mediawiki.special/mediawiki.special.userlogin.signup.css', ), + 'position' => 'top', ), - 'mediawiki.special.createaccount.js' => array( - 'scripts' => 'resources/mediawiki.special/mediawiki.special.createAccount.js', + 'mediawiki.special.userlogin.login.styles' => array( + 'styles' => array( + 'resources/mediawiki.special/mediawiki.special.userlogin.login.css', + ), + 'position' => 'top', + ), + 'mediawiki.special.userlogin.common.js' => array( + 'scripts' => array( + 'resources/mediawiki.special/mediawiki.special.userlogin.common.js', + ), 'messages' => array( 'createacct-captcha', + 'createacct-imgcaptcha-ph', + ), + ), + 'mediawiki.special.userlogin.signup.js' => array( + 'scripts' => 'resources/mediawiki.special/mediawiki.special.userlogin.signup.js', + 'messages' => array( 'createacct-emailrequired', - 'createacct-imgcaptcha-ph' ), 'dependencies' => 'mediawiki.jqueryMsg', - 'position' => 'top', ), 'mediawiki.special.javaScriptTest' => array( 'scripts' => 'resources/mediawiki.special/mediawiki.special.javaScriptTest.js', @@ -1184,6 +1263,16 @@ return array( 'vector' => 'resources/mediawiki.ui/vector.less', ), 'position' => 'top', + 'targets' => array( 'desktop', 'mobile' ), + ), + // Lightweight module for button styles + 'mediawiki.ui.button' => array( + 'skinStyles' => array( + 'default' => 'resources/mediawiki.ui/components/default/buttons.less', + 'vector' => 'resources/mediawiki.ui/components/vector/buttons.less', + ), + 'position' => 'top', + 'targets' => array( 'desktop', 'mobile' ), ), /* OOJS */ @@ -1195,5 +1284,4 @@ return array( ), 'targets' => array( 'desktop', 'mobile' ), ), - );