From b073e4159f57c370d9a8e56df68490f6beb7d9bc Mon Sep 17 00:00:00 2001 From: Fomafix Date: Wed, 22 Nov 2017 06:08:33 +0100 Subject: [PATCH] Merge mediawiki.special.userrights.styles into mediawiki.special Follows-up 5f18aae76eecf5. This reduces the number of modules. Bug: T180914 Change-Id: I4143e876495bad6530afe290ba686d7f26a43c58 --- includes/specials/SpecialUserrights.php | 2 +- resources/Resources.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php index cf8c3f57d5..a5f9ab3ec1 100644 --- a/includes/specials/SpecialUserrights.php +++ b/includes/specials/SpecialUserrights.php @@ -140,7 +140,7 @@ class UserrightsPage extends SpecialPage { $this->setHeaders(); $this->outputHeader(); - $out->addModuleStyles( 'mediawiki.special.userrights.styles' ); + $out->addModuleStyles( 'mediawiki.special' ); $this->addHelpLink( 'Help:Assigning permissions' ); $this->switchForm(); diff --git a/resources/Resources.php b/resources/Resources.php index 55bf65de8b..b6fcfeee94 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1922,7 +1922,10 @@ return [ ], ], 'mediawiki.special' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.css', + 'styles' => [ + 'resources/src/mediawiki.special/mediawiki.special.css', + 'resources/src/mediawiki.special/mediawiki.special.userrights.css', + ], 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.special.apisandbox.styles' => [ @@ -2237,9 +2240,6 @@ return [ 'mediawiki.notification.convertmessagebox', ], ], - 'mediawiki.special.userrights.styles' => [ - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.userrights.css', - ], 'mediawiki.special.watchlist' => [ 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.watchlist.js', 'messages' => [ -- 2.20.1