Merge "Use skinStyles for mediawiki.ui.icon"

diff --combined resources/Resources.php
index 538995f,cf40227..e32e4a5
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -1521,8 -1521,10 +1521,10 @@@ return array
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.ui.icon' => array(
-               'styles' => array(
-                       'resources/src/mediawiki.ui/components/icons.less',
+               'skinStyles' => array(
+                       'default' => array(
+                               'resources/src/mediawiki.ui/components/icons.less',
+                       ),
                ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
@@@ -1557,13 -1559,13 +1559,13 @@@
                'scripts' => array(
                        'resources/lib/oojs-ui/oojs-ui.js',
                ),
 -              'styles' => array(
 -                      'resources/lib/oojs-ui/oojs-ui.svg.css',
 +              'skinScripts' => array(
 +                      'default' => 'resources/lib/oojs-ui/oojs-ui-apex.js',
 +                      'minerva' => 'resources/lib/oojs-ui/oojs-ui-minerva.js',
                ),
                'skinStyles' => array(
 -                      'default' => 'resources/lib/oojs-ui/oojs-ui-apex.css',
 -                      // FIXME As of July 2014, this is to be gone "in a couple of months".
 -                      'minerva' => 'resources/lib/oojs-ui/oojs-ui-minerva.css',
 +                      'default' => 'resources/lib/oojs-ui/oojs-ui-apex.svg.css',
 +                      'minerva' => 'resources/lib/oojs-ui/oojs-ui-minerva.svg.css',
                ),
                'messages' => array(
                        'ooui-outline-control-move-down',