From: Fomafix <fomafix@googlemail.com>
Date: Wed, 22 Nov 2017 05:08:33 +0000 (+0100)
Subject: Merge mediawiki.special.userrights.styles into mediawiki.special
X-Git-Tag: 1.31.0-rc.0~1436
X-Git-Url: http://git.cyclocoop.org//%27http:/ie7-js.googlecode.com/svn/test/index.html/%27?a=commitdiff_plain;h=b073e4159f57c370d9a8e56df68490f6beb7d9bc;p=lhc%2Fweb%2Fwiklou.git

Merge mediawiki.special.userrights.styles into mediawiki.special

Follows-up 5f18aae76eecf5.

This reduces the number of modules.

Bug: T180914
Change-Id: I4143e876495bad6530afe290ba686d7f26a43c58
---

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' => [