Merge "Load preferences js/css in mobile"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 4405fe0..e55e0fe 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1474,16 +1474,6 @@ return [
        'mediawiki.action.history.styles' => [
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css',
        ],
-       // using this module is deprecated, for diff styles use mediawiki.diff.styles instead
-       'mediawiki.action.history.diff' => [
-               'styles' => [
-                       'resources/src/mediawiki/mediawiki.diff.styles.css',
-                       'resources/src/mediawiki/mediawiki.diff.styles.print.css' => [
-                               'media' => 'print'
-                       ],
-               ],
-               'targets' => [ 'desktop', 'mobile' ],
-       ],
        'mediawiki.action.view.dblClickEdit' => [
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js',
                'dependencies' => [
@@ -1842,9 +1832,13 @@ return [
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.LiveUpdateButtonWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.RcTopSectionWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.RclToOrFromWidget.less',
+                       'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.RclTargetPageWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.WatchlistTopSectionWidget.less',
                ],
                'skinStyles' => [
+                       'vector' => [
+                               'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.vector.less',
+                       ],
                        'monobook' => [
                                'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.monobook.less',
                                'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.monobook.less',
@@ -2216,6 +2210,7 @@ return [
                        'jquery.spinner',
                        'mediawiki.jqueryMsg',
                        'mediawiki.api',
+                       'mediawiki.api.parse',
                        'mediawiki.libs.jpegmeta',
                        'mediawiki.Title',
                        'mediawiki.util',