Merge "Move around "ا" to after "آ" and not before"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 0216471..3a5de66 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1056,6 +1056,7 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.hlist' => [
+               'targets' => [ 'desktop', 'mobile' ],
                'styles' => [
                        'resources/src/mediawiki/mediawiki.hlist-allskins.less',
                ],
@@ -1421,14 +1422,14 @@ return [
                'dependencies' => [
                        'mediawiki.action.edit.styles',
                        'jquery.textSelection',
-                       'jquery.byteLimit',
+                       'oojs-ui-core',
                        'mediawiki.widgets.visibleByteLimit',
                        'mediawiki.api',
                ],
        ],
        'mediawiki.action.edit.styles' => [
                'targets' => [ 'desktop', 'mobile' ],
-               'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.styles.css',
+               'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.styles.less',
        ],
        'mediawiki.action.edit.collapsibleFooter' => [
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js',
@@ -1748,6 +1749,12 @@ return [
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less',
                ],
        ],
+       'mediawiki.rcfilters.highlightCircles.seenunseen.styles' => [
+               'styles' => [
+                       'resources/src/mediawiki.rcfilters/' .
+                       'styles/mw.rcfilters.ui.ChangesListWrapperWidget.highlightCircles.seenunseen.less',
+               ],
+       ],
        'mediawiki.rcfilters.filters.dm' => [
                'scripts' => [
                        'resources/src/mediawiki.rcfilters/mw.rcfilters.js',
@@ -1796,6 +1803,8 @@ return [
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.LiveUpdateButtonWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MarkSeenButtonWidget.js',
+                       'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RcTopSectionWidget.js',
+                       'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.WatchlistTopSectionWidget.js',
                        'resources/src/mediawiki.rcfilters/mw.rcfilters.HighlightColors.js',
                        'resources/src/mediawiki.rcfilters/mw.rcfilters.init.js',
                ],
@@ -1823,6 +1832,8 @@ return [
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.less',
                        '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.WatchlistTopSectionWidget.less',
                ],
                'skinStyles' => [
                        'monobook' => [
@@ -1832,6 +1843,7 @@ return [
                        ],
                ],
                'messages' => [
+                       'rcfilters-tag-remove',
                        'rcfilters-activefilters',
                        'rcfilters-advancedfilters',
                        'rcfilters-group-results-by-page',
@@ -1887,7 +1899,8 @@ return [
                        'rcfilters-liveupdates-button',
                        'rcfilters-liveupdates-button-title-on',
                        'rcfilters-liveupdates-button-title-off',
-                       'rcfilters-watchlist-markSeen-button',
+                       'rcfilters-watchlist-markseen-button',
+                       'rcfilters-watchlist-edit-watchlist-button',
                        'rcfilters-other-review-tools',
                        'blanknamespace',
                        'namespaces',
@@ -2179,8 +2192,9 @@ return [
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.upload.styles.css',
        ],
        'mediawiki.special.userlogin.common.styles' => [
-               'styles' => [
-                       'resources/src/mediawiki.special/mediawiki.special.userlogin.common.css',
+               'targets' => [ 'desktop', 'mobile' ],
+               'skinStyles' => [
+                       'default' => 'resources/src/mediawiki.special/mediawiki.special.userlogin.common.css',
                ],
        ],
        'mediawiki.special.userlogin.login.styles' => [
@@ -2694,7 +2708,10 @@ return [
        // This contains only the styles required by core widgets.
        'oojs-ui-core.styles' => [
                'class' => 'ResourceLoaderOOUIFileModule',
-               'styles' => 'resources/src/oojs-ui-local.css', // HACK, see inside the file
+               'styles' => [
+                       'resources/lib/oojs-ui/wikimedia-ui-base.less', // Providing Wikimedia UI LESS variables to all
+                       'resources/src/oojs-ui-local.css', // HACK, see inside the file
+               ],
                'themeStyles' => 'core',
                'targets' => [ 'desktop', 'mobile' ],
        ],