jenkins-bot has submitted this change and it was merged.
Change subject: Unify `-disabled` variables usage in MediaWiki theme
......................................................................
Unify `-disabled` variables usage in MediaWiki theme
Exchange fixed values with variables values on disabled elements
and align variables' names to coding conventions.
Change-Id: I2cf38a2c2ffd17582547c35a737b2409ec0d7ea0
---
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/layouts.less
M src/themes/mediawiki/tools.less
M src/themes/mediawiki/widgets.less
5 files changed, 50 insertions(+), 48 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index adc5de7..9e1b9cd 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -27,9 +27,11 @@
@color-default-pressed: #444;
@background-color-pressed: #d0d0d0;
-@disabled-text: #ccc;
-@disabled-framed-text: #fff;
-@disabled-background: #ddd;
+@background-color-disabled: #ddd;
+@color-disabled: #ccc;
+@color-disabled-framed: #fff;
+@border-color-disabled: @background-color-disabled;
+@opacity-disabled: 0.2;
@color-invalid: #f00;
diff --git a/src/themes/mediawiki/elements.less
b/src/themes/mediawiki/elements.less
index ba0c563..dc68649 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -84,7 +84,7 @@
}
&.oo-ui-widget-disabled > .oo-ui-buttonElement-button {
- color: @disabled-text;
+ color: @color-disabled;
&:focus {
box-shadow: none;
@@ -92,7 +92,7 @@
> .oo-ui-iconElement-icon,
> .oo-ui-indicatorElement-indicator {
- opacity: 0.2;
+ opacity: @opacity-disabled;
}
}
}
@@ -164,9 +164,9 @@
}
&.oo-ui-widget-disabled > .oo-ui-buttonElement-button {
- color: @disabled-framed-text;
- background: @disabled-background;
- border: 1px solid @disabled-background;
+ background: @background-color-disabled;
+ color: @color-disabled-framed;
+ border: 1px solid @border-color-disabled;
}
&.oo-ui-widget-enabled {
diff --git a/src/themes/mediawiki/layouts.less
b/src/themes/mediawiki/layouts.less
index 3b22e1f..8202587 100644
--- a/src/themes/mediawiki/layouts.less
+++ b/src/themes/mediawiki/layouts.less
@@ -75,7 +75,7 @@
}
&-disabled > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label {
- color: #ccc;
+ color: @color-disabled;
}
&-messages {
diff --git a/src/themes/mediawiki/tools.less b/src/themes/mediawiki/tools.less
index c40b4ae..fc0b9d5 100644
--- a/src/themes/mediawiki/tools.less
+++ b/src/themes/mediawiki/tools.less
@@ -141,11 +141,11 @@
&.oo-ui-widget-disabled > .oo-ui-tool-link {
.oo-ui-tool-title {
- color: #ccc;
+ color: @color-disabled;
}
.oo-ui-iconElement-icon {
- opacity: 0.2;
+ opacity: @opacity-disabled;
}
}
@@ -167,11 +167,11 @@
&.oo-ui-widget-disabled > .oo-ui-toolGroup-tools > .oo-ui-tool {
> a.oo-ui-tool-link {
.oo-ui-tool-title {
- color: #ccc;
+ color: @color-disabled;
}
.oo-ui-iconElement-icon {
- opacity: 0.2;
+ opacity: @opacity-disabled;
}
}
}
@@ -355,7 +355,7 @@
&.oo-ui-widget-disabled {
.oo-ui-tool-link {
.oo-ui-tool-title {
- color: #ccc;
+ color: @color-disabled;
}
.oo-ui-tool-accel {
@@ -363,18 +363,18 @@
}
.oo-ui-iconElement-icon {
- opacity: 0.2;
+ opacity: @opacity-disabled;
}
}
}
}
&.oo-ui-widget-disabled {
- color: #ccc;
+ color: @color-disabled;
.oo-ui-indicatorElement-indicator,
.oo-ui-iconElement-icon {
- opacity: 0.2;
+ opacity: @opacity-disabled;
}
}
}
@@ -410,21 +410,21 @@
&.oo-ui-widget-disabled {
.oo-ui-tool-link .oo-ui-tool-title {
- color: #ccc;
+ color: @color-disabled;
}
.oo-ui-tool-link .oo-ui-iconElement-icon {
- opacity: 0.2;
+ opacity: @opacity-disabled;
}
}
}
&.oo-ui-widget-disabled {
- color: #ccc;
+ color: @color-disabled;
.oo-ui-indicatorElement-indicator,
.oo-ui-iconElement-icon {
- opacity: 0.2;
+ opacity: @opacity-disabled;
}
}
}
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index ab72cc9..c463e48 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -82,7 +82,7 @@
width: @icon-size;
&.oo-ui-widget-disabled {
- opacity: 0.2;
+ opacity: @opacity-disabled;
}
}
@@ -93,7 +93,7 @@
margin: @indicator-size / 2;
&.oo-ui-widget-disabled {
- opacity: 0.2;
+ opacity: @opacity-disabled;
}
}
@@ -145,9 +145,9 @@
&.oo-ui-widget-disabled {
.oo-ui-dropdownWidget-handle {
- color: #ccc;
+ color: @color-disabled;
text-shadow: 0 1px 1px #fff;
- border-color: #ddd;
+ border-color: @border-color-disabled;
background-color: #f3f3f3;
&:focus {
@@ -155,7 +155,7 @@
}
}
.oo-ui-indicatorElement-indicator {
- opacity: 0.2;
+ opacity: @opacity-disabled;
}
}
@@ -239,21 +239,21 @@
&.oo-ui-widget-disabled {
.oo-ui-selectFileWidget-info {
- color: #ccc;
+ color: @color-disabled;
text-shadow: 0 1px 1px #fff;
- border-color: #ddd;
+ border-color: @border-color-disabled;
background-color: #f3f3f3;
> .oo-ui-iconElement-icon,
> .oo-ui-indicatorElement-indicator {
- opacity: 0.2;
+ opacity: @opacity-disabled;
}
}
}
&-empty {
.oo-ui-selectFileWidget-label {
- color: #ccc;
+ color: @color-disabled;
}
}
@@ -326,9 +326,9 @@
&.oo-ui-widget-disabled,
&-notsupported {
.oo-ui-selectFileWidget-dropTarget {
- color: #ccc;
+ color: @color-disabled;
text-shadow: 0 1px 1px #fff;
- border-color: #ddd;
+ border-color: @border-color-disabled;
background-color: #f3f3f3;
}
}
@@ -449,8 +449,8 @@
&.oo-ui-widget-disabled {
select {
- color: #ccc;
- border-color: #ddd;
+ color: @color-disabled;
+ border-color: @border-color-disabled;
background-color: #f3f3f3;
}
}
@@ -613,14 +613,14 @@
&.oo-ui-widget-disabled {
input,
textarea {
- color: #ccc;
+ color: @color-disabled;
text-shadow: 0 1px 1px #fff;
- border-color: #ddd;
+ border-color: @border-color-disabled;
background-color: #f3f3f3;
}
.oo-ui-iconElement-icon,
.oo-ui-indicatorElement-indicator {
- opacity: 0.2;
+ opacity: @opacity-disabled;
}
.oo-ui-labelElement-label {
color: #ddd;
@@ -761,15 +761,15 @@
}
&.oo-ui-widget-disabled &-handle {
- color: #ccc;
+ color: @color-disabled;
text-shadow: 0 1px 1px #fff;
- border-color: #ddd;
+ border-color: @border-color-disabled;
background-color: #f3f3f3;
cursor: default;
> .oo-ui-iconElement-icon,
> .oo-ui-indicatorElement-indicator {
- opacity: 0.2;
+ opacity: @opacity-disabled;
}
}
@@ -813,13 +813,13 @@
}
&.oo-ui-widget-disabled {
- color: #ccc;
+ color: @color-disabled;
text-shadow: 0 1px 1px #fff;
- border-color: #ddd;
+ border-color: @border-color-disabled;
background-color: #f3f3f3;
> .oo-ui-indicatorElement-indicator {
- opacity: 0.2;
+ opacity: @opacity-disabled;
}
}
}
@@ -846,7 +846,7 @@
}
&.oo-ui-widget-disabled {
- color: #ccc;
+ color: @color-disabled;
}
}
@@ -872,7 +872,7 @@
&.oo-ui-widget-disabled {
.oo-ui-iconElement-icon,
.oo-ui-indicatorElement-indicator {
- opacity: 0.2;
+ opacity: @opacity-disabled;
}
}
}
@@ -1292,12 +1292,12 @@
}
&.oo-ui-widget-disabled {
- background: @disabled-background;
- border-color: @disabled-background;
+ background: @background-color-disabled;
+ border-color: @border-color-disabled;
outline: 0;
.oo-ui-toggleSwitchWidget-grip {
- background: @disabled-framed-text;
+ background: @color-disabled-framed;
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/263216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2cf38a2c2ffd17582547c35a737b2409ec0d7ea0
Gerrit-PatchSet: 4
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: VolkerE <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
