From 144cbb05dcbb5700b3eb9729f155df9b4929809e Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Fri, 24 May 2019 15:10:27 +0100 Subject: [PATCH] SpecialBlockList: Merge stylesheet in into 'mediawiki.special' bundle Follows-up d87220349536 and (before that) 15eac4c27939c. Bug: T191549 Change-Id: I60f227283526cf7e45b2e8e2be17d25bb73d9a27 --- includes/specials/SpecialBlockList.php | 2 +- resources/Resources.php | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) 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' => [ -- 2.20.1