jenkins-bot has submitted this change and it was merged.

Change subject: MediaWiki Theme: Adjust ButtonSelectWidget, ButtonGroupWidget 
highlights
......................................................................


MediaWiki Theme: Adjust ButtonSelectWidget, ButtonGroupWidget highlights

Bug: T78032
Change-Id: I49f1fe3b2348c4eca5c4ae86f5374fd14c6cefb4
---
M demos/pages/widgets.js
M src/themes/mediawiki/common.less
M src/themes/mediawiki/widgets.less
3 files changed, 55 insertions(+), 0 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 0202dea..d56d38e 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -493,6 +493,25 @@
                                ]
                        } ),
                        {
+                               label: 'ButtonGroupWidget (colors)',
+                               align: 'top'
+                       }
+               ),
+               new OO.ui.FieldLayout(
+                       new OO.ui.ButtonGroupWidget( {
+                               items: [
+                                       new OO.ui.ToggleButtonWidget( {
+                                               label: 'One'
+                                       } ),
+                                       new OO.ui.ToggleButtonWidget( {
+                                               label: 'Two'
+                                       } ),
+                                       new OO.ui.ToggleButtonWidget( {
+                                               label: 'Three'
+                                       } )
+                               ]
+                       } ),
+                       {
                                label: 'ButtonGroupWidget',
                                align: 'top'
                        }
@@ -523,6 +542,28 @@
                                ]
                        } ),
                        {
+                               label: 'ButtonSelectWidget (colors)',
+                               align: 'top'
+                       }
+               ),
+               new OO.ui.FieldLayout(
+                       new OO.ui.ButtonSelectWidget( {
+                               items: [
+                                       new OO.ui.ButtonOptionWidget( {
+                                               data: 'b',
+                                               label: 'One'
+                                       } ),
+                                       new OO.ui.ButtonOptionWidget( {
+                                               data: 'c',
+                                               label: 'Two'
+                                       } ),
+                                       new OO.ui.ButtonOptionWidget( {
+                                               data: 'd',
+                                               label: 'Three'
+                                       } )
+                               ]
+                       } ),
+                       {
                                label: 'ButtonSelectWidget',
                                align: 'top'
                        }
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index a23d11b..afcc915 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -6,6 +6,7 @@
 @progressive: #598ad1;
 @constructive: #00c697;
 @destructive: #e81915;
+@highlight: #999;
 
 @progressive-selected: #015ccc;
 @constructive-selected: #008c6d;
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index c4f5159..a9bf05b 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -31,6 +31,13 @@
        border-radius: @border-radius;
 
        .oo-ui-buttonElement-framed {
+               &.oo-ui-buttonElement-active {
+                       .oo-ui-buttonElement-button {
+                               background: @highlight;
+                               color: #fff;
+                       }
+               }
+
                .oo-ui-buttonElement-button {
                        border-radius: 0;
                        margin-left: -1px;
@@ -694,6 +701,12 @@
        border-radius: @border-radius;
 
        .oo-ui-buttonOptionWidget {
+               &.oo-ui-buttonElement-active {
+                       .oo-ui-buttonElement-button {
+                               background: @highlight;
+                               color: #fff;
+                       }
+               }
                .oo-ui-buttonElement-button {
                        border-radius: 0;
                        margin-left: -1px;

-- 
To view, visit https://gerrit.wikimedia.org/r/186134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I49f1fe3b2348c4eca5c4ae86f5374fd14c6cefb4
Gerrit-PatchSet: 4
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <psax...@wikimedia.org>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to