Merge "Load styles in 'oojs-ui-widgets' again rather than a separate module"

diff --combined resources/Resources.php
index e912242,68404f4..96a76df
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -224,6 -224,9 +224,6 @@@ return 
                'scripts' => 'resources/lib/jquery/jquery.cookie.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
 -      'jquery.expandableField' => [
 -              'scripts' => 'resources/src/jquery/jquery.expandableField.js',
 -      ],
        'jquery.form' => [
                'scripts' => 'resources/lib/jquery/jquery.form.js',
        ],
@@@ -1296,6 -1299,7 +1296,6 @@@
        ],
        'mediawiki.ForeignStructuredUpload.BookletLayout' => [
                'scripts' => 'resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js',
 -              'styles' => 'resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.less',
                'dependencies' => [
                        'mediawiki.ForeignStructuredUpload',
                        'mediawiki.Upload.BookletLayout',
@@@ -2868,9 -2872,9 +2868,9 @@@
        'oojs-ui-widgets' => [
                'class' => ResourceLoaderOOUIFileModule::class,
                'scripts' => 'resources/lib/oojs-ui/oojs-ui-widgets.js',
+               'themeStyles' => 'widgets',
                'dependencies' => [
                        'oojs-ui-core',
-                       'oojs-ui-widgets.styles',
                        'oojs-ui.styles.icons-interactions',
                        'oojs-ui.styles.icons-content',
                        'oojs-ui.styles.icons-editing-advanced',