From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 24 May 2019 14:10:27 +0000 (+0100)
Subject: SpecialBlockList: Merge stylesheet in into 'mediawiki.special' bundle
X-Git-Tag: 1.34.0-rc.0~1600^2
X-Git-Url: http://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=144cbb05dcbb5700b3eb9729f155df9b4929809e;p=lhc%2Fweb%2Fwiklou.git

SpecialBlockList: Merge stylesheet in into 'mediawiki.special' bundle

Follows-up d87220349536 and (before that) 15eac4c27939c.

Bug: T191549
Change-Id: I60f227283526cf7e45b2e8e2be17d25bb73d9a27
---

diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index 4e541c9581..8c6ad2d074 100644
--- a/includes/specials/SpecialBlockList.php
+++ b/includes/specials/SpecialBlockList.php
@@ -45,7 +45,7 @@ class SpecialBlockList extends SpecialPage {
 		$this->outputHeader();
 		$out = $this->getOutput();
 		$out->setPageTitle( $this->msg( 'ipblocklist' ) );
-		$out->addModuleStyles( [ 'mediawiki.special', 'mediawiki.special.blocklist' ] );
+		$out->addModuleStyles( [ 'mediawiki.special' ] );
 
 		$request = $this->getRequest();
 		$par = $request->getVal( 'ip', $par );
diff --git a/resources/Resources.php b/resources/Resources.php
index 1b8cffb28d..483e37426c 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2027,6 +2027,7 @@ return [
 			'resources/src/mediawiki.special/userrights.css',
 			'resources/src/mediawiki.special/watchlist.css',
 			'resources/src/mediawiki.special/block.less',
+			'resources/src/mediawiki.special/blocklist.less',
 		],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
@@ -2129,10 +2130,6 @@ return [
 		],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
-	'mediawiki.special.blocklist' => [
-		'styles' => 'resources/src/mediawiki.special/blocklist.less',
-		'targets' => [ 'desktop', 'mobile' ],
-	],
 	'mediawiki.special.changecredentials.js' => [
 		'scripts' => 'resources/src/mediawiki.special.changecredentials.js',
 		'dependencies' => [