Spage has uploaded a new change for review.
https://gerrit.wikimedia.org/r/58438
Change subject: Remove blue, red, green dependent selectors
......................................................................
Remove blue, red, green dependent selectors
These were synonyms for primary, destructive, constructive and aren't in
use.
Change-Id: I34d99eee603bef04208c5b91c3a138602c1ad7b1
---
M modules/css/mediawiki.ui.vector.css
M modules/scss/components/vector/_buttons.scss
2 files changed, 16 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Agora
refs/changes/38/58438/1
diff --git a/modules/css/mediawiki.ui.vector.css
b/modules/css/mediawiki.ui.vector.css
index ccf84b7..a401801 100644
--- a/modules/css/mediawiki.ui.vector.css
+++ b/modules/css/mediawiki.ui.vector.css
@@ -126,8 +126,8 @@
border-bottom-right-radius: 3px;
}
-/* line 7, ../scss/components/vector/_buttons.scss */
-.mw-ui-button.blue, .mw-ui-button.primary {
+/* line 6, ../scss/components/vector/_buttons.scss */
+.mw-ui-button.primary {
background-color: #3366bb;
*background-color: #3366bb;
*zoom: 1;
@@ -142,7 +142,7 @@
border: 1px solid #3162b3;
}
/* line 38, ../scss/mixins/_effects.scss */
-.mw-ui-button.blue:hover, .mw-ui-button.blue.hover,
.mw-ui-button.primary:hover, .mw-ui-button.primary.hover {
+.mw-ui-button.primary:hover, .mw-ui-button.primary.hover {
background-color: #4779cd;
*background-color: #4779cd;
*zoom: 1;
@@ -155,20 +155,20 @@
text-decoration: none;
}
/* line 44, ../scss/mixins/_effects.scss */
-.mw-ui-button.blue:active, .mw-ui-button.blue.active,
.mw-ui-button.primary:active, .mw-ui-button.primary.active {
+.mw-ui-button.primary:active, .mw-ui-button.primary.active {
background-image: none;
background-color: #305faf;
text-shadow: none;
}
/* line 54, ../scss/mixins/_effects.scss */
-.mw-ui-button.blue:disabled, .mw-ui-button.blue.disabled,
.mw-ui-button.primary:disabled, .mw-ui-button.primary.disabled {
+.mw-ui-button.primary:disabled, .mw-ui-button.primary.disabled {
background-image: none;
background-color: #3366bb;
opacity: 0.5;
text-shadow: none;
}
-/* line 12, ../scss/components/vector/_buttons.scss */
-.mw-ui-button.green, .mw-ui-button.constructive {
+/* line 10, ../scss/components/vector/_buttons.scss */
+.mw-ui-button.constructive {
background-color: #27aa65;
*background-color: #27aa65;
*zoom: 1;
@@ -183,7 +183,7 @@
border: 1px solid #25a260;
}
/* line 38, ../scss/mixins/_effects.scss */
-.mw-ui-button.green:hover, .mw-ui-button.green.hover,
.mw-ui-button.constructive:hover, .mw-ui-button.constructive.hover {
+.mw-ui-button.constructive:hover, .mw-ui-button.constructive.hover {
background-color: #2ec977;
*background-color: #2ec977;
*zoom: 1;
@@ -196,20 +196,20 @@
text-decoration: none;
}
/* line 44, ../scss/mixins/_effects.scss */
-.mw-ui-button.green:active, .mw-ui-button.green.active,
.mw-ui-button.constructive:active, .mw-ui-button.constructive.active {
+.mw-ui-button.constructive:active, .mw-ui-button.constructive.active {
background-image: none;
background-color: #249e5e;
text-shadow: none;
}
/* line 54, ../scss/mixins/_effects.scss */
-.mw-ui-button.green:disabled, .mw-ui-button.green.disabled,
.mw-ui-button.constructive:disabled, .mw-ui-button.constructive.disabled {
+.mw-ui-button.constructive:disabled, .mw-ui-button.constructive.disabled {
background-image: none;
background-color: #27aa65;
opacity: 0.5;
text-shadow: none;
}
-/* line 17, ../scss/components/vector/_buttons.scss */
-.mw-ui-button.red, .mw-ui-button.destructive {
+/* line 14, ../scss/components/vector/_buttons.scss */
+.mw-ui-button.destructive {
background-color: #cc0000;
*background-color: #cc0000;
*zoom: 1;
@@ -224,7 +224,7 @@
border: 1px solid #c20000;
}
/* line 38, ../scss/mixins/_effects.scss */
-.mw-ui-button.red:hover, .mw-ui-button.red.hover,
.mw-ui-button.destructive:hover, .mw-ui-button.destructive.hover {
+.mw-ui-button.destructive:hover, .mw-ui-button.destructive.hover {
background-color: #f20000;
*background-color: #f20000;
*zoom: 1;
@@ -237,13 +237,13 @@
text-decoration: none;
}
/* line 44, ../scss/mixins/_effects.scss */
-.mw-ui-button.red:active, .mw-ui-button.red.active,
.mw-ui-button.destructive:active, .mw-ui-button.destructive.active {
+.mw-ui-button.destructive:active, .mw-ui-button.destructive.active {
background-image: none;
background-color: #bd0000;
text-shadow: none;
}
/* line 54, ../scss/mixins/_effects.scss */
-.mw-ui-button.red:disabled, .mw-ui-button.red.disabled,
.mw-ui-button.destructive:disabled, .mw-ui-button.destructive.disabled {
+.mw-ui-button.destructive:disabled, .mw-ui-button.destructive.disabled {
background-image: none;
background-color: #cc0000;
opacity: 0.5;
diff --git a/modules/scss/components/vector/_buttons.scss
b/modules/scss/components/vector/_buttons.scss
index 0ee721a..8ab2a42 100644
--- a/modules/scss/components/vector/_buttons.scss
+++ b/modules/scss/components/vector/_buttons.scss
@@ -1,19 +1,16 @@
@import "../default/buttons"; // Layer Vector on top of the default settings.
.mw-ui-button {
- // Button colors
+ // Button colors determined by function.
// -----------------------------------------
- &.blue,
&.primary {
@include buttonColors($agoraBlue);
}
- &.green,
&.constructive {
@include buttonColors($agoraGreen);
}
- &.red,
&.destructive {
@include buttonColors($agoraRed);
}
--
To view, visit https://gerrit.wikimedia.org/r/58438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34d99eee603bef04208c5b91c3a138602c1ad7b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Agora
Gerrit-Branch: master
Gerrit-Owner: Spage <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
