Merge "jquery.confirmable: Add a space between buttons"

diff --combined resources/Resources.php
index c634d9d,10cfbbb..70905fb
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -200,6 -200,7 +200,7 @@@ return array
                        'confirmable-confirm',
                        'confirmable-yes',
                        'confirmable-no',
+                       'word-separator',
                ),
                'styles' => 'resources/src/jquery/jquery.confirmable.css',
                'dependencies' => 'mediawiki.jqueryMsg',
@@@ -984,10 -985,8 +985,10 @@@
  
        'mediawiki.action.edit' => array(
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.js',
 +              'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.css',
                'dependencies' => array(
                        'mediawiki.action.edit.styles',
 +                      'mediawiki.action.edit.toolbar',
                        'jquery.textSelection',
                        'jquery.byteLimit',
                ),
@@@ -997,10 -996,6 +998,10 @@@
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.styles.css',
                'position' => 'top',
        ),
 +      'mediawiki.action.edit.toolbar' => array(
 +              'class' => 'ResourceLoaderEditToolbarModule',
 +              'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.toolbar/mediawiki.action.edit.toolbar.less',
 +      ),
        'mediawiki.action.edit.collapsibleFooter' => array(
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js',
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css',
@@@ -1175,11 -1170,11 +1176,11 @@@
        'mediawiki.page.ready' => array(
                'scripts' => 'resources/src/mediawiki.page/mediawiki.page.ready.js',
                'dependencies' => array(
 +                      'jquery.accessKeyLabel',
                        'jquery.checkboxShiftClick',
                        'jquery.makeCollapsible',
                        'jquery.placeholder',
                        'jquery.mw-jump',
 -                      'mediawiki.util',
                ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@@ -1300,10 -1295,6 +1301,10 @@@
                'dependencies' => array(
                        'mediawiki.language',
                ),
 +              'messages' => array(
 +                      'prefswarning-warning',
 +                      'saveprefs',
 +              ),
        ),
        'mediawiki.special.recentchanges' => array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.recentchanges.js',
@@@ -1435,27 -1426,21 +1436,27 @@@
                'position' => 'top',
        ),
        'mediawiki.legacy.commonPrint' => array(
 -              'styles' => array( 'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' ) ),
 +              'styles' => array(
 +                      'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' )
 +              ),
        ),
        'mediawiki.legacy.protect' => array(
                'scripts' => 'resources/src/mediawiki.legacy/protect.js',
                'dependencies' => array(
                        'jquery.byteLimit',
                ),
 -              'position' => 'top',
 +              'messages' => array( 'protect-unchain-permissions' )
        ),
        'mediawiki.legacy.shared' => array(
                // Used in the web installer. Test it after modifying this definition!
 -              'styles' => array( 'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' ) ),
 +              'styles' => array(
 +                      'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' )
 +              ),
        ),
        'mediawiki.legacy.oldshared' => array(
 -              'styles' => array( 'resources/src/mediawiki.legacy/oldshared.css' => array( 'media' => 'screen' ) ),
 +              'styles' => array(
 +                      'resources/src/mediawiki.legacy/oldshared.css' => array( 'media' => 'screen' )
 +              ),
        ),
        'mediawiki.legacy.wikibits' => array(
                'scripts' => 'resources/src/mediawiki.legacy/wikibits.js',
@@@ -1468,48 -1453,38 +1469,48 @@@
        /* MediaWiki UI */
  
        'mediawiki.ui' => array(
 -              'styles' => array(
 -                      'resources/src/mediawiki.ui/default.less',
 +              'skinStyles' => array(
 +                      'default' => array(
 +                              'resources/src/mediawiki.ui/default.less',
 +                      ),
                ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.ui.checkbox' => array(
 -              'styles' => array(
 -                      'resources/src/mediawiki.ui/components/checkbox.less',
 +              'skinStyles' => array(
 +                      'default' => array(
 +                              'resources/src/mediawiki.ui/components/checkbox.less',
 +                      ),
                ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        // Lightweight module for anchor styles
        'mediawiki.ui.anchor' => array(
 -              'styles' => array(
 -                      'resources/src/mediawiki.ui/components/anchors.less',
 +              'skinStyles' => array(
 +                      'default' => array(
 +                              'resources/src/mediawiki.ui/components/anchors.less',
 +                      ),
                ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        // Lightweight module for button styles
        'mediawiki.ui.button' => array(
 -              'styles' => array(
 -                      'resources/src/mediawiki.ui/components/buttons.less',
 +              'skinStyles' => array(
 +                      'default' => array(
 +                              'resources/src/mediawiki.ui/components/buttons.less',
 +                      ),
                ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.ui.input' => array(
 -              'styles' => array(
 -                      'resources/src/mediawiki.ui/components/inputs.less',
 +              'skinStyles' => array(
 +                      'default' => array(
 +                              'resources/src/mediawiki.ui/components/inputs.less',
 +                      ),
                ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),