jenkins-bot has submitted this change and it was merged.
Change subject: MediaWiki theme: Make `box-shadow` LESS vars follow naming
scheme
......................................................................
MediaWiki theme: Make `box-shadow` LESS vars follow naming scheme
Change the `box-shadow` LESS variables to follow the general naming
scheme with a state modifier `-focus` at the end of the variable name.
Also, remove an obsolete variable, and introducing a general widget one
for transition purposes.
Change-Id: Icfd621b81453b03a40cdcb89e9568461ea76eb24
---
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
3 files changed, 24 insertions(+), 24 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index 3553a94..1314c29 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -98,12 +98,12 @@
@box-shadow-dialog: 0 0.15em 0 0 rgba( 0, 0, 0, 0.15 );
@box-shadow-menu: @box-shadow-dialog;
-@box-shadow-active: inset 0 0 0 1px @color-progressive-active;
-@box-shadow-focus-default: inset 0 0 0 1px @color-progressive;
-@box-shadow-focus-inset: inset 0 0 0 1px @color-progressive, inset 0 0 0 2px
@color-default-light;
-@box-shadow-focus-readonly: inset 0 0 0 1px #c8ccd1;
+@box-shadow-widget: inset 0 0 0 1px @background-color-default;
+@box-shadow-widget-focus: inset 0 0 0 1px @color-progressive;
+@box-shadow-progressive-focus: inset 0 0 0 1px @color-progressive, inset 0 0 0
2px @color-default-light;
+@box-shadow-input-binary-active: inset 0 0 0 1px @color-progressive-active;
+@box-shadow-readonly-focus: inset 0 0 0 1px #c8ccd1;
@box-shadow-disabled-filled: inset 0 0 0 1px @color-disabled-filled;
-@box-shadow-light-inset: inset 0 0 0 1px @color-default-light;
@line-height-default: 1.4;
diff --git a/src/themes/mediawiki/elements.less
b/src/themes/mediawiki/elements.less
index fccc6e0..4c39e8b 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -102,7 +102,7 @@
color: @color-default-hover;
}
&:focus {
- box-shadow: @box-shadow-focus-default,
0 0 0 1px @color-progressive-focus;
+ box-shadow: @box-shadow-widget-focus, 0
0 0 1px @color-progressive-focus;
}
}
@@ -232,8 +232,8 @@
}
&:focus {
- border-color: @color-progressive-focus;
- box-shadow: @box-shadow-focus-default;
+ border-color:
@border-color-default-focus;
+ box-shadow: @box-shadow-widget-focus;
}
}
@@ -251,7 +251,7 @@
&:focus {
border-color: @color-progressive-focus;
- box-shadow: inset 0 0 0 1px
@color-progressive-focus, inset 0 0 0 2px @color-default-light;
+ box-shadow:
@box-shadow-progressive-focus;
}
}
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index 3311f90..60ff9e6 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -179,7 +179,7 @@
&:focus {
border-color: @border-color-default-focus;
outline: 0;
- box-shadow: @box-shadow-focus-default;
+ box-shadow: @box-shadow-widget-focus;
}
.oo-ui-iconElement-icon,
@@ -471,12 +471,12 @@
&:active:focus + span {
background-color: @color-progressive-active;
border-color: @border-color-input-binary-active;
- box-shadow: @box-shadow-active;
+ box-shadow: @box-shadow-input-binary-active;
}
&:focus + span {
border-color: @color-progressive;
- box-shadow: @box-shadow-focus-default;
+ box-shadow: @box-shadow-widget-focus;
}
&:checked {
@@ -496,13 +496,13 @@
&:active:focus + span {
background-color:
@background-color-input-binary-active;
border-color: @border-color-input-binary-active;
- box-shadow: @box-shadow-active;
+ box-shadow: @box-shadow-input-binary-active;
}
&:focus + span {
background-color:
@background-color-input-binary-on;
border-color: @border-color-input-binary-on;
- box-shadow: @box-shadow-focus-inset;
+ box-shadow: @box-shadow-progressive-focus;
}
}
}
@@ -672,7 +672,7 @@
&:active + span,
&:active:focus + span {
border-color: @border-color-input-binary-active;
- box-shadow: inset 0 0 0 1px
@border-color-input-binary-active;
+ box-shadow: @box-shadow-input-binary-active;
&:before {
border-color:
@border-color-input-binary-active;
@@ -680,7 +680,7 @@
}
&:focus + span {
- box-shadow: @box-shadow-focus-default;
+ box-shadow: @box-shadow-widget-focus;
&:before {
border-color: @background-color-default;
@@ -739,7 +739,7 @@
&.oo-ui-widget-enabled {
input,
textarea {
- box-shadow: inset 0 0 0 0.1em
@background-color-default; // necessary for smooth transition
+ box-shadow: @box-shadow-widget; // necessary for smooth
transition
.oo-ui-transition(
border-color @transition-ease-out-sine-medium,
box-shadow @transition-ease-out-sine-medium
@@ -751,7 +751,7 @@
&:focus {
outline: 0;
border-color: @color-progressive;
- box-shadow: @box-shadow-focus-default;
+ box-shadow: @box-shadow-widget-focus;
}
&[readonly] {
@@ -762,7 +762,7 @@
}
&:focus {
border-color: @border-color-readonly;
- box-shadow: @box-shadow-focus-readonly;
+ box-shadow: @box-shadow-readonly-focus;
}
}
}
@@ -976,7 +976,7 @@
&.oo-ui-widget-enabled.oo-ui-capsuleMultiselectWidget-open &-handle {
border-color: @border-color-default-focus;
outline: 0;
- box-shadow: @box-shadow-focus-default;
+ box-shadow: @box-shadow-widget-focus;
}
&.oo-ui-widget-disabled &-handle {
@@ -1012,7 +1012,7 @@
&:focus {
outline: 0;
border-color: @color-progressive;
- box-shadow: @box-shadow-focus-default;
+ box-shadow: @box-shadow-widget-focus;
}
&.oo-ui-widget-disabled {
@@ -1393,7 +1393,7 @@
.oo-ui-buttonOptionWidget.oo-ui-optionWidget-selected {
.oo-ui-buttonElement-button {
border-color:
@border-color-default-focus;
- box-shadow: @box-shadow-focus-inset;
+ box-shadow:
@box-shadow-progressive-focus;
}
}
}
@@ -1559,7 +1559,7 @@
&:active:focus {
background-color: @background-color-input-binary-active;
border-color: @border-color-input-binary-active;
- box-shadow: @box-shadow-active;
+ box-shadow: @box-shadow-input-binary-active;
.oo-ui-toggleSwitchWidget-grip {
background-color: @background-color-default;
@@ -1569,7 +1569,7 @@
}
&:focus {
border-color: @color-progressive;
- box-shadow: @box-shadow-focus-default;
+ box-shadow: @box-shadow-widget-focus;
outline: 0;
.oo-ui-toggleSwitchWidget-grip {
--
To view, visit https://gerrit.wikimedia.org/r/325123
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icfd621b81453b03a40cdcb89e9568461ea76eb24
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Prtksxna <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
