jenkins-bot has submitted this change and it was merged.
Change subject: MediaWiki theme: Clear border on selected framed buttons
......................................................................
MediaWiki theme: Clear border on selected framed buttons
Making `border-color` of selected buttons in ButtonSelect-, ButtonGroup- and
ToggleButtonWidget equal to `background-color` in order to appear clearer.
Also adapting `z-index` to circumvent visual inaccuracies in `:hover` and
`:active` state.
Bug: T142550
Change-Id: I1616a6fef72d40ab7af97e0829ffb286bd290b38
---
M src/styles/widgets/ButtonOptionWidget.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
4 files changed, 29 insertions(+), 13 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/styles/widgets/ButtonOptionWidget.less
b/src/styles/widgets/ButtonOptionWidget.less
index fe21409..7509330 100644
--- a/src/styles/widgets/ButtonOptionWidget.less
+++ b/src/styles/widgets/ButtonOptionWidget.less
@@ -3,10 +3,6 @@
.oo-ui-buttonOptionWidget {
display: inline-block;
- .oo-ui-buttonElement-button {
- position: relative;
- }
-
&.oo-ui-iconElement .oo-ui-iconElement-icon,
&.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator {
position: static;
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index 90e3a3b..36d4196 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -52,12 +52,14 @@
@border-color-default: #ccc;
@border-color-default-hover: #aaa;
+@border-color-default-focus: @color-progressive-focus;
@border-color-disabled: #ddd;
@border-color-disabled-framed: @color-disabled-framed;
@border-color-progressive-active: #859dcc; // equivalents `fade(
@color-progressive-active, 50% )`
@border-color-destructive-active: #b77c79; // equivalents `fade(
@color-destructive-active, 50% )`
@border-color-focus-inset: @color-default-light;
@border-color-dialog: #aaa;
+@border-color-buttonelement-active: @background-color-active;
@border-radius-default: 2px;
diff --git a/src/themes/mediawiki/elements.less
b/src/themes/mediawiki/elements.less
index 89a50cb..7bba06c 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -179,12 +179,17 @@
&.oo-ui-buttonElement-pressed >
.oo-ui-buttonElement-button {
background-color: darken(
@background-color-default, 15% );
border-color: darken(
@background-color-default, 15% );
- box-shadow: none;
}
&.oo-ui-buttonElement-active >
.oo-ui-buttonElement-button {
background-color: @background-color-active;
color: @color-default-light;
+ border-color:
@border-color-buttonelement-active;
+ z-index: 3;
+
+ &:focus {
+ border-color: @color-progressive-focus;
+ }
}
&.oo-ui-flaggedElement {
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index c76807f..d2b1fe1 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -50,6 +50,15 @@
border-top-right-radius: @border-radius-default;
}
}
+
+ &.oo-ui-widget-enabled {
+ .oo-ui-buttonElement {
+ .oo-ui-buttonElement-button:focus {
+ border-color: @border-color-default-focus;
+ z-index: 3;
+ }
+ }
+ }
}
.theme-oo-ui-buttonWidget () {
@@ -1180,14 +1189,6 @@
&:focus {
outline: 0;
-
- .oo-ui-buttonOptionWidget.oo-ui-optionWidget-selected {
- .oo-ui-buttonElement-button {
- border-color: @color-progressive-focus;
- box-shadow: @box-shadow-focus-default;
- z-index: 2;
- }
- }
}
.oo-ui-buttonOptionWidget {
@@ -1206,6 +1207,18 @@
border-bottom-right-radius: @border-radius-default;
border-top-right-radius: @border-radius-default;
}
+
+ }
+
+ &.oo-ui-widget-enabled {
+ &:focus {
+ .oo-ui-buttonOptionWidget.oo-ui-optionWidget-selected {
+ .oo-ui-buttonElement-button {
+ border-color:
@border-color-default-focus;
+ box-shadow: @box-shadow-focus-default;
+ }
+ }
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/303973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1616a6fef72d40ab7af97e0829ffb286bd290b38
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE <volke...@wikimedia.org>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Nirzar <npangar...@wikimedia.org>
Gerrit-Reviewer: Prtksxna <psax...@wikimedia.org>
Gerrit-Reviewer: VolkerE <volke...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
