Merge "Add appropriate OOjs UI icon pack dependencies for OOjs UI itself"

diff --combined resources/Resources.php
index f095f83,1b607ce..46aafd5
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -1944,9 -1944,6 +1944,9 @@@ return 
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.css',
                'targets' => [ 'desktop', 'mobile' ],
        ],
 +      'mediawiki.special.changeslist.enhanced' => [
 +              'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css',
 +      ],
        'mediawiki.special.changeslist.legend' => [
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.legend.css',
                'targets' => [ 'desktop', 'mobile' ],
@@@ -1959,6 -1956,9 +1959,6 @@@
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
 -      'mediawiki.special.changeslist.enhanced' => [
 -              'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css',
 -      ],
        'mediawiki.special.changeslist.visitedstatus' => [
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.visitedstatus.js',
        ],
@@@ -2027,6 -2027,13 +2027,6 @@@
                        'mediawiki.notification.convertmessagebox',
                ],
        ],
 -      '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.preferences.styles' => [
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.styles.css',
        ],
@@@ -2044,6 -2051,15 +2044,6 @@@
                        'powersearch-togglenone',
                ],
        ],
 -      'mediawiki.special.search.styles' => [
 -              'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.styles.css',
 -              'targets' => [ 'desktop', 'mobile' ],
 -      ],
 -      'mediawiki.special.search.interwikiwidget.styles' => [
 -              'styles' => 'resources/src/mediawiki.special/'
 -                      . 'mediawiki.special.search.interwikiwidget.styles.less',
 -              'targets' => [ 'desktop', 'mobile' ]
 -      ],
        'mediawiki.special.search.commonsInterwikiWidget' => [
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js',
                'dependencies' => [
@@@ -2056,38 -2072,9 +2056,38 @@@
                        'searchprofile-images'
                ],
        ],
 +      'mediawiki.special.search.interwikiwidget.styles' => [
 +              'styles' => 'resources/src/mediawiki.special/'
 +                      . 'mediawiki.special.search.interwikiwidget.styles.less',
 +              'targets' => [ 'desktop', 'mobile' ]
 +      ],
 +      'mediawiki.special.search.styles' => [
 +              'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.styles.css',
 +              'targets' => [ 'desktop', 'mobile' ],
 +      ],
        'mediawiki.special.undelete' => [
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.undelete.js',
        ],
 +      'mediawiki.special.unwatchedPages' => [
 +              'scripts' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.js',
 +              'styles' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.css',
 +              'messages' => [
 +                      'addedwatchtext-short',
 +                      'removedwatchtext-short',
 +                      'unwatch',
 +                      'unwatching',
 +                      'watch',
 +                      'watcherrortext',
 +                      'watching',
 +              ],
 +              'dependencies' => [
 +                      'mediawiki.api',
 +                      'mediawiki.api.watch',
 +                      'mediawiki.notify',
 +                      'mediawiki.Title',
 +                      'mediawiki.util',
 +              ],
 +      ],
        'mediawiki.special.upload' => [
                'templates' => [
                        'thumbnail.html' => 'resources/src/mediawiki.special/templates/thumbnail.html',
@@@ -2124,6 -2111,11 +2124,6 @@@
                        'resources/src/mediawiki.special/mediawiki.special.userlogin.common.css',
                ],
        ],
 -      'mediawiki.special.userlogin.signup.styles' => [
 -              'styles' => [
 -                      'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.css',
 -              ],
 -      ],
        'mediawiki.special.userlogin.login.styles' => [
                'styles' => [
                        'resources/src/mediawiki.special/mediawiki.special.userlogin.login.css',
@@@ -2143,16 -2135,24 +2143,16 @@@
                        'mediawiki.htmlform.checker',
                ],
        ],
 -      'mediawiki.special.unwatchedPages' => [
 -              'scripts' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.js',
 -              'styles' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.css',
 -              'messages' => [
 -                      'addedwatchtext-short',
 -                      'removedwatchtext-short',
 -                      'unwatch',
 -                      'unwatching',
 -                      'watch',
 -                      'watcherrortext',
 -                      'watching',
 +      'mediawiki.special.userlogin.signup.styles' => [
 +              'styles' => [
 +                      'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.css',
                ],
 +      ],
 +      'mediawiki.special.userrights' => [
 +              'styles' => 'resources/src/mediawiki.special/mediawiki.special.userrights.css',
 +              'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userrights.js',
                'dependencies' => [
 -                      'mediawiki.api',
 -                      'mediawiki.api.watch',
 -                      'mediawiki.notify',
 -                      'mediawiki.Title',
 -                      'mediawiki.util',
 +                      'mediawiki.notification.convertmessagebox',
                ],
        ],
        'mediawiki.special.watchlist' => [
@@@ -2587,6 -2587,9 +2587,9 @@@
                        'oojs-ui.styles.indicators',
                        'oojs-ui.styles.textures',
                        'mediawiki.language',
+                       'oojs-ui.styles.icons-content',
+                       'oojs-ui.styles.icons-alerts',
+                       'oojs-ui.styles.icons-interactions',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@@ -2602,7 -2605,14 +2605,14 @@@
                'class' => 'ResourceLoaderOOUIFileModule',
                'scripts' => 'resources/lib/oojs-ui/oojs-ui-widgets.js',
                'themeStyles' => 'widgets',
-               'dependencies' => 'oojs-ui-core',
+               'dependencies' => [
+                       'oojs-ui-core',
+                       'oojs-ui.styles.icons-interactions',
+                       'oojs-ui.styles.icons-content',
+                       'oojs-ui.styles.icons-editing-advanced',
+                       'oojs-ui.styles.icons-movement',
+                       'oojs-ui.styles.icons-moderation',
+               ],
                'messages' => [
                        'ooui-outline-control-move-down',
                        'ooui-outline-control-move-up',
@@@ -2619,7 -2629,10 +2629,10 @@@
                'class' => 'ResourceLoaderOOUIFileModule',
                'scripts' => 'resources/lib/oojs-ui/oojs-ui-toolbars.js',
                'themeStyles' => 'toolbars',
-               'dependencies' => 'oojs-ui-core',
+               'dependencies' => [
+                       'oojs-ui-core',
+                       'oojs-ui.styles.icons-movement',
+               ],
                'messages' => [
                        'ooui-toolbar-more',
                        'ooui-toolgroup-collapse',
@@@ -2632,7 -2645,10 +2645,10 @@@
                'class' => 'ResourceLoaderOOUIFileModule',
                'scripts' => 'resources/lib/oojs-ui/oojs-ui-windows.js',
                'themeStyles' => 'windows',
-               'dependencies' => 'oojs-ui-core',
+               'dependencies' => [
+                       'oojs-ui-core',
+                       'oojs-ui.styles.icons-movement',
+               ],
                'messages' => [
                        'ooui-dialog-message-accept',
                        'ooui-dialog-message-reject',