Merge "mediawiki.special: Combine various tiny specialpage style modules"

diff --combined resources/Resources.php
index 4a4c179,cdd225d..b9b10dc
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -303,8 -303,8 +303,8 @@@ return 
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'jquery.spinner' => [
 -              'scripts' => 'resources/src/jquery/jquery.spinner.js',
 -              'styles' => 'resources/src/jquery/jquery.spinner.css',
 +              'scripts' => 'resources/src/jquery.spinner/spinner.js',
 +              'styles' => 'resources/src/jquery.spinner/spinner.css',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'jquery.jStorage' => [
@@@ -1994,15 -1994,18 +1994,18 @@@
        ],
        'mediawiki.special' => [
                'styles' => [
-                       'resources/src/mediawiki.special/mediawiki.special.css',
-                       'resources/src/mediawiki.special/mediawiki.special.userrights.css',
+                       'resources/src/mediawiki.special/special.css',
+                       'resources/src/mediawiki.special/apisandbox.css',
+                       'resources/src/mediawiki.special/comparepages.less',
+                       'resources/src/mediawiki.special/edittags.css',
+                       'resources/src/mediawiki.special/movePage.css',
+                       'resources/src/mediawiki.special/pagesWithProp.css',
+                       'resources/src/mediawiki.special/upload.css',
+                       'resources/src/mediawiki.special/userrights.css',
+                       'resources/src/mediawiki.special/watchlist.css',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
-       'mediawiki.special.apisandbox.styles' => [
-               'targets' => [ 'desktop', 'mobile' ],
-               'styles' => 'resources/src/mediawiki.special.apisandbox.styles.css',
-       ],
        'mediawiki.special.apisandbox' => [
                'styles' => 'resources/src/mediawiki.special.apisandbox/apisandbox.css',
                'scripts' => 'resources/src/mediawiki.special.apisandbox/apisandbox.js',
@@@ -2119,9 -2122,6 +2122,6 @@@
        'mediawiki.special.changeslist.visitedstatus' => [
                'scripts' => 'resources/src/mediawiki.special.changeslist.visitedstatus.js',
        ],
-       'mediawiki.special.comparepages.styles' => [
-               'styles' => 'resources/src/mediawiki.special.comparepages.styles.less',
-       ],
        'mediawiki.special.contributions' => [
                'scripts' => 'resources/src/mediawiki.special.contributions.js',
                'dependencies' => [
@@@ -2140,9 -2140,6 +2140,6 @@@
                        'tags-edit-chosen-no-results',
                ],
        ],
-       'mediawiki.special.edittags.styles' => [
-               'styles' => 'resources/src/mediawiki.special.edittags.styles.css',
-       ],
        'mediawiki.special.import' => [
                'scripts' => 'resources/src/mediawiki.special.import.js',
        ],
@@@ -2153,18 -2150,12 +2150,12 @@@
                        'mediawiki.widgets',
                ],
        ],
-       'mediawiki.special.movePage.styles' => [
-               'styles' => 'resources/src/mediawiki.special.movePage.css',
-       ],
        'mediawiki.special.pageLanguage' => [
                'scripts' => 'resources/src/mediawiki.special.pageLanguage.js',
                'dependencies' => [
                        'oojs-ui-core',
                ],
        ],
-       'mediawiki.special.pagesWithProp' => [
-               'styles' => 'resources/src/mediawiki.special.pagesWithProp.css',
-       ],
        'mediawiki.special.preferences' => [
                'targets' => [ 'desktop', 'mobile' ],
                'scripts' => [
@@@ -2311,7 -2302,7 +2302,7 @@@
                        'prefs-editing',
                ],
                'dependencies' => [
-                       'mediawiki.special.upload.styles',
+                       'mediawiki.special',
                        'jquery.spinner',
                        'mediawiki.jqueryMsg',
                        'mediawiki.api',
@@@ -2323,9 -2314,6 +2314,6 @@@
                        'user.options',
                ],
        ],
-       'mediawiki.special.upload.styles' => [
-               'styles' => 'resources/src/mediawiki.special.upload.styles.css',
-       ],
        'mediawiki.special.userlogin.common.styles' => [
                'targets' => [ 'desktop', 'mobile' ],
                'skinStyles' => [
@@@ -2384,9 -2372,6 +2372,6 @@@
                        'user.options',
                ],
        ],
-       'mediawiki.special.watchlist.styles' => [
-               'styles' => 'resources/src/mediawiki.special.watchlist.styles.css',
-       ],
        'mediawiki.special.version' => [
                'styles' => 'resources/src/mediawiki.special.version.css',
        ],