Merge "Load preferences js/css in mobile"

diff --combined resources/Resources.php
index 0e9ab18,4405fe0..e55e0fe
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -1474,6 -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' => [
@@@ -1832,13 -1842,9 +1832,13 @@@
                        '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',
@@@ -2106,6 -2112,7 +2106,7 @@@
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.pagesWithProp.css',
        ],
        'mediawiki.special.preferences' => [
+               'targets' => [ 'desktop', 'mobile' ],
                'scripts' => [
                        'resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js',
                        'resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js',
@@@ -2126,6 -2133,7 +2127,7 @@@
                ],
        ],
        'mediawiki.special.preferences.styles' => [
+               'targets' => [ 'desktop', 'mobile' ],
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.styles.css',
        ],
        'mediawiki.special.recentchanges' => [
@@@ -2208,7 -2216,6 +2210,7 @@@
                        'jquery.spinner',
                        'mediawiki.jqueryMsg',
                        'mediawiki.api',
 +                      'mediawiki.api.parse',
                        'mediawiki.libs.jpegmeta',
                        'mediawiki.Title',
                        'mediawiki.util',