Merge "Add 'mediawiki.ui.button' CSS module"

diff --git a/resources/Resources.php b/resources/Resources.php
index ceacee6..bf7fe8d 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1194,6 +1194,16 @@ return array(
                        'vector' => 'resources/mediawiki.ui/vector.less',
                ),
                'position' => 'top',
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+       // Lightweight module for button styles
+       'mediawiki.ui.button' => array(
+               'skinStyles' => array(
+                       'default' => 'resources/mediawiki.ui/components/default/buttons.less',
+                       'vector' => 'resources/mediawiki.ui/components/vector/buttons.less',
+               ),
+               'position' => 'top',
+               'targets' => array( 'desktop', 'mobile' ),
        ),
 
        /* OOJS */
@@ -1205,5 +1215,4 @@ return array(
                ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
-
 );

diff --git a/resources/mediawiki.ui/default.less b/resources/mediawiki.ui/default.less
index 036db5f..05045d5 100644 (file)
--- a/resources/mediawiki.ui/default.less
+++ b/resources/mediawiki.ui/default.less
@@ -3,6 +3,8 @@
  * Vector.
  */
 
+// FIXME: remove import for button styles as soon as extensions using mediawiki.ui are
+// updated to use mediawiki.ui.button as well.
 @import "components/utilities";
 @import "components/default/buttons";
 @import "components/default/forms";

diff --git a/resources/mediawiki.ui/vector.less b/resources/mediawiki.ui/vector.less
index a347562..f736b5c 100644 (file)
--- a/resources/mediawiki.ui/vector.less
+++ b/resources/mediawiki.ui/vector.less
@@ -2,6 +2,8 @@
  * Provide Agora appearance for mw-ui-* classes when using the Vector skin.
  */
 
+// FIXME: remove import for button styles as soon as extensions using mediawiki.ui are
+// updated to use mediawiki.ui.button as well.
 @import "components/utilities";
 @import "components/vector/buttons";
 @import "components/vector/forms";