Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164389
Change subject: Apex, MediaWiki themes: Move colour definitions into LESS
variables
......................................................................
Apex, MediaWiki themes: Move colour definitions into LESS variables
Change-Id: I3a35a5dd0bcd1875d6007fea81fa345bab285fb0
---
M src/themes/apex/elements.less
M src/themes/mediawiki/elements.less
2 files changed, 31 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/89/164389/1
diff --git a/src/themes/apex/elements.less b/src/themes/apex/elements.less
index 4151669..75ed5dc 100644
--- a/src/themes/apex/elements.less
+++ b/src/themes/apex/elements.less
@@ -1,5 +1,9 @@
@import 'common';
+@primary: #087ecc;
+@constructive: #76ab36;
+@destructive: #d45353;
+
.theme-oo-ui-buttonElement () {
> .oo-ui-buttonElement-button {
color: #333;
@@ -45,15 +49,15 @@
&.oo-ui-flaggedElement {
&-primary > .oo-ui-buttonElement-button >
.oo-ui-labelElement-label {
- color: #087ecc;
+ color: @primary;
}
&-constructive > .oo-ui-buttonElement-button >
.oo-ui-labelElement-label {
- color: #76ab36;
+ color: @constructive;
}
&-destructive > .oo-ui-buttonElement-button >
.oo-ui-labelElement-label {
- color: #d45353;
+ color: @destructive;
}
}
@@ -144,7 +148,7 @@
}
&-destructive > .oo-ui-buttonElement-button {
- color: #d45353;
+ color: @destructive;
}
}
diff --git a/src/themes/mediawiki/elements.less
b/src/themes/mediawiki/elements.less
index 600574e..be847f1 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -1,5 +1,21 @@
@import 'common';
+@primary: #087ecc;
+@constructive: #76ab36;
+@destructive: #d45353;
+
+@disabled-percentage: 20%;
+@disabled-primary: darken( @primary, @disabled-percentage );
+@disabled-constructive: darken( @constructive, @disabled-percentage );
+@disabled-destructive: darken( @destructive, @disabled-percentage );
+
+@text: #757575;
+@active-text: #444444;
+@disabled-text: #dddddd;
+
+@disabled-button-border: solid 1px #cdcdcd;
+
+
.theme-oo-ui-buttonElement () {
> .oo-ui-buttonElement-button {
font-weight: bold;
@@ -26,7 +42,7 @@
}
> .oo-ui-labelElement-label {
- color: #ddd;
+ color: @disabled-text;
}
}
@@ -37,12 +53,12 @@
&.oo-ui-widget-enabled {
> .oo-ui-buttonElement-button >
.oo-ui-labelElement-label {
- color: #757575;
+ color: @text;
}
&.oo-ui-buttonElement-active >
.oo-ui-buttonElement-button > .oo-ui-labelElement-label,
&.oo-ui-buttonElement-pressed >
.oo-ui-buttonElement-button > .oo-ui-labelElement-label {
- color: #444444;
+ color: @active-text;
}
&.oo-ui-flaggedElement {
@@ -91,16 +107,16 @@
}
&.oo-ui-widget-disabled > .oo-ui-buttonElement-button {
- color: #ddd;
+ color: @disabled-text;
background: #fff;
border: solid 1px #cdcdcd;
}
&.oo-ui-widget-enabled {
> .oo-ui-buttonElement-button {
- color: #757575;
+ color: @text;
background-color: #fff;
- border: solid 1px #cdcdcd;
+ border: @disabled-button-border;
&:hover,
&:focus {
@@ -148,7 +164,7 @@
&.oo-ui-buttonElement-active > .oo-ui-buttonElement-button >
.oo-ui-labelElement-label,
&.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button >
.oo-ui-labelElement-label {
- color: @active;
+ color: @active-text;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/164389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a35a5dd0bcd1875d6007fea81fa345bab285fb0
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
