jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Make special pages group 'other'
......................................................................
Hygiene: Make special pages group 'other'
They should not be cached along side normal css
Remove a redundant position top property since module is added via
addModuleStyles
Change-Id: Iee48212e9282856a6e04ee7ebe5344224c5d60cc
---
M extension.json
M resources/Resources.php
2 files changed, 14 insertions(+), 8 deletions(-)
Approvals:
Robmoen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 67fa96a..6da724c 100644
--- a/extension.json
+++ b/extension.json
@@ -81,11 +81,10 @@
"mobile",
"desktop"
],
+ "group": "other",
"styles": [
"ext.gather.styles/collections.less"
- ],
- "position": "top",
- "group": "other"
+ ]
},
"ext.gather.watchstar.icons": {
"targets": [
@@ -179,6 +178,7 @@
"mobile",
"desktop"
],
+ "group": "other",
"dependencies": [
"ext.gather.collection.editor"
],
diff --git a/resources/Resources.php b/resources/Resources.php
index 8386e54..5e782d0 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -40,6 +40,13 @@
'targets' => array( 'mobile', 'desktop' ),
);
+/**
+ * A ResourceLoaderFileModule template for special pages
+ */
+$wgGatherMobileSpecialPageResourceBoilerplate =
$wgGatherResourceFileModuleBoilerplate + array(
+ 'group' => 'other',
+);
+
$wgResourceModules += array(
'ext.gather.icons' => $wgGatherResourceFileModuleBoilerplate + array(
@@ -54,12 +61,10 @@
),
),
- 'ext.gather.styles' => $wgGatherResourceFileModuleBoilerplate + array(
+ 'ext.gather.styles' => $wgGatherMobileSpecialPageResourceBoilerplate +
array(
'styles' => array(
'ext.gather.styles/collections.less',
),
- 'position' => 'top',
- 'group' => 'other',
),
'ext.gather.watchstar.icons' => $wgGatherResourceFileModuleBoilerplate
+ array(
@@ -138,7 +143,7 @@
),
),
- 'ext.gather.special' => $wgGatherResourceFileModuleBoilerplate + array(
+ 'ext.gather.special' => $wgGatherMobileSpecialPageResourceBoilerplate +
array(
'dependencies' => array(
'ext.gather.collection.editor',
),
@@ -149,7 +154,7 @@
);
-$wgResourceModuleSkinStyles['vector'] = $wgGatherResourceFileModuleBoilerplate
+ array(
+$wgResourceModuleSkinStyles['vector'] =
$wgGatherMobileSpecialPageResourceBoilerplate + array(
'ext.gather.styles' => array(
'ext.gather.styles/vector.less',
),
@@ -157,3 +162,4 @@
unset( $wgGatherResourceFileModuleBoilerplate );
unset( $wgGatherResourceBoilerplate );
+unset( $wgGatherMobileSpecialPageResourceBoilerplate );
--
To view, visit https://gerrit.wikimedia.org/r/194938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee48212e9282856a6e04ee7ebe5344224c5d60cc
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Robmoen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
