Merge "Skin: Make skins aware of their registered skin name"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 235bb59..4df8194 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1110,7 +1110,7 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.htmlform.ooui.styles' => [
-               'styles' => 'resources/src/mediawiki/htmlform/ooui.styles.css',
+               'styles' => 'resources/src/mediawiki/htmlform/ooui.styles.less',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.icon' => [
@@ -1904,6 +1904,7 @@ return [
                        'rcfilters-view-namespaces-tooltip',
                        'rcfilters-view-tags-tooltip',
                        'rcfilters-view-return-to-default-tooltip',
+                       'rcfilters-view-tags-help-icon-tooltip',
                        'rcfilters-liveupdates-button',
                        'rcfilters-liveupdates-button-title-on',
                        'rcfilters-liveupdates-button-title-off',
@@ -1921,6 +1922,7 @@ return [
                        'jquery.makeCollapsible',
                        'mediawiki.language',
                        'mediawiki.user',
+                       'mediawiki.util',
                        'mediawiki.rcfilters.filters.dm',
                        'oojs-ui.styles.icons-content',
                        'oojs-ui.styles.icons-moderation',
@@ -2012,6 +2014,8 @@ return [
        'mediawiki.special.block' => [
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.block.js',
                'dependencies' => [
+                       'oojs-ui-core',
+                       'mediawiki.widgets.SelectWithInputWidget',
                        'mediawiki.util',
                        'mediawiki.htmlform',
                ],
@@ -2653,6 +2657,21 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
 
+       /**
+        * html5shiv
+        *
+        * This library is intended to run on older browsers
+        * that MediaWiki no longer supports as Grade A, and
+        * is not loaded through the normal module loading
+        * system.
+        */
+       'html5shiv' => [
+               'scripts' => [
+                       'resources/lib/html5shiv/html5shiv.js'
+               ],
+               'raw' => true,
+       ],
+
        /* OOjs */
        'oojs' => [
                'scripts' => [