Merge "Move styles for Special:UserRights to separate style module"

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index 0a712ef..4e4394d 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' );
+               $out->addModuleStyles( 'mediawiki.special.userrights.styles' );
                $this->addHelpLink( 'Help:Assigning permissions' );
 
                $this->switchForm();

diff --git a/resources/Resources.php b/resources/Resources.php
index 715f339..d9fa8e0 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2230,12 +2230,14 @@ return [
                ],
        ],
        'mediawiki.special.userrights' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.userrights.css',
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userrights.js',
                'dependencies' => [
                        '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' => [

diff --git a/resources/src/mediawiki.special/mediawiki.special.css b/resources/src/mediawiki.special/mediawiki.special.css
index 7f3b09a..5d0ec49 100644 (file)
--- a/resources/src/mediawiki.special/mediawiki.special.css
+++ b/resources/src/mediawiki.special/mediawiki.special.css
@@ -122,16 +122,3 @@
        color: #72777d;
        font-size: 90%;
 }
-
-/* Special:UserRights */
-.mw-userrights-disabled {
-       color: #72777d;
-}
-.mw-userrights-groups * td,
-.mw-userrights-groups * th {
-       padding-right: 1.5em;
-}
-
-.mw-userrights-groups * th {
-       text-align: left;
-}

diff --git a/resources/src/mediawiki.special/mediawiki.special.userrights.css b/resources/src/mediawiki.special/mediawiki.special.userrights.css
index a4b4087..acfdb56 100644 (file)
--- a/resources/src/mediawiki.special/mediawiki.special.userrights.css
+++ b/resources/src/mediawiki.special/mediawiki.special.userrights.css
@@ -10,3 +10,15 @@
        display: inline-block;
        vertical-align: middle;
 }
+
+.mw-userrights-disabled {
+       color: #72777d;
+}
+.mw-userrights-groups * td,
+.mw-userrights-groups * th {
+       padding-right: 1.5em;
+}
+
+.mw-userrights-groups * th {
+       text-align: left;
+}