Merge "Add print styles for gallery mode packed-hover"

[lhc/web/wiklou.git] / resources / Resources.php

diff --git a/resources/Resources.php b/resources/Resources.php
index ae8436a..f9590ec 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1653,8 +1653,8 @@ return [
        ],
        'mediawiki.page.gallery.styles' => [
                'styles' => [
-                       'resources/src/mediawiki/page/gallery.print.css' => [ 'media' => 'print' ],
                        'resources/src/mediawiki/page/gallery.css',
+                       'resources/src/mediawiki/page/gallery.print.css' => [ 'media' => 'print' ],
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -1917,7 +1917,7 @@ return [
                        'quotation-marks',
                ],
                'dependencies' => [
-                       'oojs-ui',
+                       'oojs-ui-widgets',
                        'jquery.makeCollapsible',
                        'mediawiki.language',
                        'mediawiki.user',
@@ -1927,8 +1927,7 @@ return [
                        'oojs-ui.styles.icons-editing-core',
                        'oojs-ui.styles.icons-editing-styling',
                        'oojs-ui.styles.icons-interactions',
-                       'oojs-ui.styles.icons-content',
-                       'oojs-ui.styles.icons-interactions',
+                       'oojs-ui.styles.icons-layout',
                        'oojs-ui.styles.icons-media',
                ],
        ],
@@ -2093,7 +2092,12 @@ return [
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.pagesWithProp.css',
        ],
        'mediawiki.special.preferences' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.preferences.js',
+               'scripts' => [
+                       'resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js',
+                       'resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js',
+                       'resources/src/mediawiki.special/mediawiki.special.preferences.tabs.js',
+                       'resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js',
+               ],
                'messages' => [
                        'prefs-tabs-navigation-hint',
                        'prefswarning-warning',