Merge "mediawiki.helplink: Use a SVG+PNG icon"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index a158af7..2c80a85 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -820,6 +820,11 @@ return array(
                'scripts' => 'resources/src/mediawiki.api/mediawiki.api.login.js',
                'dependencies' => 'mediawiki.api',
        ),
+       'mediawiki.api.options' => array(
+               'scripts' => 'resources/src/mediawiki.api/mediawiki.api.options.js',
+               'dependencies' => 'mediawiki.api',
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
        'mediawiki.api.parse' => array(
                'scripts' => 'resources/src/mediawiki.api/mediawiki.api.parse.js',
                'dependencies' => 'mediawiki.api',
@@ -892,9 +897,18 @@ return array(
                        'feedback-useragent'
                ),
        ),
+
+       'mediawiki.filewarning' => array(
+               'scripts' => 'resources/src/mediawiki/mediawiki.filewarning.js',
+               'styles' => 'resources/src/mediawiki/mediawiki.filewarning.less',
+               'dependencies' => array(
+                       'oojs-ui',
+               ),
+       ),
+
        'mediawiki.helplink' => array(
                'styles' => array(
-                       'resources/src/mediawiki/mediawiki.helplink.css',
+                       'resources/src/mediawiki/mediawiki.helplink.less',
                ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@ -966,14 +980,8 @@ return array(
                ),
        ),
        'mediawiki.sectionAnchor' => array(
-               'skinStyles' => array(
-                       'default' => array(
-                               'resources/src/mediawiki/mediawiki.sectionAnchor.css' =>
-                                       array( 'media' => 'screen'),
-                               'resources/src/mediawiki/mediawiki.sectionAnchor.hide.css' =>
-                                       array( 'media' => 'print' ),
-                       ),
-               ),
+               // Back-compat to hide it on cached pages (T18691; Ie9e334e973; 2015-03-17)
+               'styles' => 'resources/src/mediawiki/mediawiki.sectionAnchor.css',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.Title' => array(