jenkins-bot has submitted this change and it was merged.

Change subject: Fix overriding of vector styles in resources definition
......................................................................


Fix overriding of vector styles in resources definition

This is breaking stuff like Special:Preferences on enwiki,
and interfering with styling on beta.wikidata, among
other issues.

Bug: T93050
Change-Id: I24cb928c1c77696002930d183b0955a32a724a62
---
M resources/Resources.php
1 file changed, 3 insertions(+), 7 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/Resources.php b/resources/Resources.php
index b2eaf65..7b2e600 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -66,6 +66,9 @@
                        'ext.gather.styles/collections.less',
                        'ext.gather.styles/lists.less',
                ),
+               'skinStyles' => array(
+                       'vector' => 'ext.gather.styles/vector.less'
+               ),
        ),
 
        'ext.gather.watchstar.icons' => $wgGatherResourceFileModuleBoilerplate 
+ array(
@@ -240,13 +243,6 @@
                'scripts' => array(
                        'ext.gather.lists/init.js',
                ),
-       )
-
-);
-
-$wgResourceModuleSkinStyles['vector'] = 
$wgGatherMobileSpecialPageResourceBoilerplate + array(
-       'ext.gather.styles' => array(
-               'ext.gather.styles/vector.less',
        ),
 );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/201503
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I24cb928c1c77696002930d183b0955a32a724a62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: wmf/1.25wmf23
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to