Merge "Replace spinner.gif with CSS solution"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 26 Mar 2019 23:45:24 +0000 (23:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 26 Mar 2019 23:45:24 +0000 (23:45 +0000)
1  2 
resources/Resources.php

diff --combined resources/Resources.php
@@@ -294,7 -294,7 +294,7 @@@ return 
        ],
        'jquery.spinner' => [
                'scripts' => 'resources/src/jquery.spinner/spinner.js',
-               'styles' => 'resources/src/jquery.spinner/spinner.css',
+               'styles' => 'resources/src/jquery.spinner/spinner.less',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'jquery.jStorage' => [
                'group' => 'jquery.ui',
        ],
        'jquery.ui.spinner' => [
 +              'deprecated' => 'Please use "jquery.spinner" instead.',
                'scripts' => 'resources/lib/jquery.ui/jquery.ui.spinner.js',
                'dependencies' => [
                        'jquery.ui.core',
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.css',
        ],
        'mediawiki.action.history.styles' => [
 -              'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css',
 +              'skinStyles' => [
 +                      'default' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css',
 +              ],
        ],
        'mediawiki.action.view.dblClickEdit' => [
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js',
                        'parentheses-end',
                        'pipe-separator'
                ],
 -              'styles' => [
 -                      'resources/src/mediawiki.interface.helpers.styles.less',
 +              'skinStyles' => [
 +                      'default' => 'resources/src/mediawiki.interface.helpers.styles.less',
                ],
                'targets' => [
                        'desktop', 'mobile'