jenkins-bot has submitted this change and it was merged.
Change subject: Use the power of alphabet to ensure reset file loads first.
......................................................................
Use the power of alphabet to ensure reset file loads first.
Change-Id: Ib6c3eb1afcd7cdb58f33642aa31c11b7cbed05d6
---
M includes/Resources.php
M includes/skins/SkinMinerva.php
R resources/skins.minerva.base.reset/reset.less
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index fb084ba..0fcd330 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -30,9 +30,9 @@
* these with respect to caching.
**/
$wgMinervaStyleModules = array(
- 'skins.minerva.reset' => $wgMFResourceFileModuleBoilerplate + array(
+ 'skins.minerva.base.reset' => $wgMFResourceFileModuleBoilerplate +
array(
'styles' => array(
- 'resources/skins.minerva.reset/reset.less',
+ 'resources/skins.minerva.base.reset/reset.less',
),
),
@@ -40,7 +40,7 @@
'skins.minerva.chrome.styles' => $wgMFResourceFileModuleBoilerplate +
array(
'position' => 'top',
'styles' => array(
- 'resources/skins.minerva.reset/reset.less',
+ 'resources/skins.minerva.base.reset/reset.less',
'less/ui.less',
'less/pageactions.less',
'less/footer.less',
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 35ce177..e6451a5 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1027,7 +1027,7 @@
protected function getSkinStyles() {
$title = $this->getTitle();
$styles = array(
- 'skins.minerva.reset',
+ 'skins.minerva.base.reset',
'skins.minerva.base.styles',
'skins.minerva.content.styles',
'skins.minerva.tablet.styles',
diff --git a/resources/skins.minerva.reset/reset.less
b/resources/skins.minerva.base.reset/reset.less
similarity index 100%
rename from resources/skins.minerva.reset/reset.less
rename to resources/skins.minerva.base.reset/reset.less
--
To view, visit https://gerrit.wikimedia.org/r/213329
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6c3eb1afcd7cdb58f33642aa31c11b7cbed05d6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.wel...@t-online.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
