Merge "Maintenance: add fatalError() method"

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index cf8c3f5..a5f9ab3 100644 (file)
--- 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 55bf65d..b6fcfee 100644 (file)
--- 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' => [