jenkins-bot has submitted this change and it was merged.
Change subject: Only use .mw-ui-button to select buttons
......................................................................
Only use .mw-ui-button to select buttons
Avoid redundant sub-selections like .mw-ui-button button.
Change-Id: I9bbe60ab738499e32d7fb92e070b0db0aed75f56
---
M modules/css/mediawiki.ui.default.css
M modules/css/mediawiki.ui.vector.css
M modules/scss/components/default/_buttons.scss
M modules/scss/components/vector/_buttons.scss
4 files changed, 49 insertions(+), 69 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/css/mediawiki.ui.default.css
b/modules/css/mediawiki.ui.default.css
index 14c2a90..a9d9785 100644
--- a/modules/css/mediawiki.ui.default.css
+++ b/modules/css/mediawiki.ui.default.css
@@ -22,8 +22,8 @@
margin-right: auto;
}
-/* line 10, ../scss/components/default/_buttons.scss */
-button.mw-ui-button, input[type="submit"].mw-ui-button, a.mw-ui-button {
+/* line 4, ../scss/components/default/_buttons.scss */
+.mw-ui-button {
display: -moz-inline-stack;
display: inline-block;
vertical-align: middle;
@@ -59,7 +59,7 @@
cursor: pointer;
}
/* line 38, ../scss/mixins/_effects.scss */
-button.mw-ui-button:hover, button.mw-ui-button.hover,
input[type="submit"].mw-ui-button:hover,
input[type="submit"].mw-ui-button.hover, a.mw-ui-button:hover,
a.mw-ui-button.hover {
+.mw-ui-button:hover, .mw-ui-button.hover {
background-color: gainsboro;
*background-color: gainsboro;
*zoom: 1;
@@ -72,36 +72,34 @@
text-decoration: none;
}
/* line 44, ../scss/mixins/_effects.scss */
-button.mw-ui-button:active, button.mw-ui-button.active,
input[type="submit"].mw-ui-button:active,
input[type="submit"].mw-ui-button.active, a.mw-ui-button:active,
a.mw-ui-button.active {
+.mw-ui-button:active, .mw-ui-button.active {
background-image: none;
background-color: #c1c1c1;
text-shadow: none;
}
/* line 54, ../scss/mixins/_effects.scss */
-button.mw-ui-button:disabled, button.mw-ui-button.disabled,
input[type="submit"].mw-ui-button:disabled,
input[type="submit"].mw-ui-button.disabled, a.mw-ui-button:disabled,
a.mw-ui-button.disabled {
+.mw-ui-button:disabled, .mw-ui-button.disabled {
background-image: none;
background-color: #c9c9c9;
opacity: 0.5;
text-shadow: none;
}
-/* line 39, ../scss/components/default/_buttons.scss */
-button.mw-ui-button:disabled, button.mw-ui-button.disabled,
input[type="submit"].mw-ui-button:disabled,
input[type="submit"].mw-ui-button.disabled, a.mw-ui-button:disabled,
a.mw-ui-button.disabled {
+/* line 33, ../scss/components/default/_buttons.scss */
+.mw-ui-button:disabled, .mw-ui-button.disabled {
cursor: default;
}
-/* line 45, ../scss/components/default/_buttons.scss */
-button.mw-ui-button.big, input[type="submit"].mw-ui-button.big,
a.mw-ui-button.big {
+/* line 39, ../scss/components/default/_buttons.scss */
+.mw-ui-button.big {
font-size: 1.3em;
}
-/* line 50, ../scss/components/default/_buttons.scss */
-button.mw-ui-button.block, input[type="submit"].mw-ui-button.block,
a.mw-ui-button.block {
+/* line 44, ../scss/components/default/_buttons.scss */
+.mw-ui-button.block {
display: block;
width: 100%;
}
-/* line 59, ../scss/components/default/_buttons.scss */
-.mw-ui-button-group button,
-.mw-ui-button-group input[type="submit"],
-.mw-ui-button-group a {
+/* line 51, ../scss/components/default/_buttons.scss */
+.mw-ui-button-group > * {
-webkit-border-radius: 0;
-moz-border-radius: 0;
-ms-border-radius: 0;
@@ -109,10 +107,8 @@
border-radius: 0;
float: left;
}
-/* line 63, ../scss/components/default/_buttons.scss */
-.mw-ui-button-group button:first-child,
-.mw-ui-button-group input[type="submit"]:first-child,
-.mw-ui-button-group a:first-child {
+/* line 55, ../scss/components/default/_buttons.scss */
+.mw-ui-button-group > *:first-child {
-moz-border-radius-topleft: 3px;
-webkit-border-top-left-radius: 3px;
border-top-left-radius: 3px;
@@ -120,10 +116,8 @@
-webkit-border-bottom-left-radius: 3px;
border-bottom-left-radius: 3px;
}
-/* line 68, ../scss/components/default/_buttons.scss */
-.mw-ui-button-group button:last-child,
-.mw-ui-button-group input[type="submit"]:last-child,
-.mw-ui-button-group a:last-child {
+/* line 60, ../scss/components/default/_buttons.scss */
+.mw-ui-button-group > *:last-child {
-moz-border-radius-topright: 3px;
-webkit-border-top-right-radius: 3px;
border-top-right-radius: 3px;
diff --git a/modules/css/mediawiki.ui.vector.css
b/modules/css/mediawiki.ui.vector.css
index 41e1c1c..ccf84b7 100644
--- a/modules/css/mediawiki.ui.vector.css
+++ b/modules/css/mediawiki.ui.vector.css
@@ -22,8 +22,8 @@
margin-right: auto;
}
-/* line 10, ../scss/components/default/_buttons.scss */
-button.mw-ui-button, input[type="submit"].mw-ui-button, a.mw-ui-button {
+/* line 4, ../scss/components/default/_buttons.scss */
+.mw-ui-button {
display: -moz-inline-stack;
display: inline-block;
vertical-align: middle;
@@ -59,7 +59,7 @@
cursor: pointer;
}
/* line 38, ../scss/mixins/_effects.scss */
-button.mw-ui-button:hover, button.mw-ui-button.hover,
input[type="submit"].mw-ui-button:hover,
input[type="submit"].mw-ui-button.hover, a.mw-ui-button:hover,
a.mw-ui-button.hover {
+.mw-ui-button:hover, .mw-ui-button.hover {
background-color: gainsboro;
*background-color: gainsboro;
*zoom: 1;
@@ -72,36 +72,34 @@
text-decoration: none;
}
/* line 44, ../scss/mixins/_effects.scss */
-button.mw-ui-button:active, button.mw-ui-button.active,
input[type="submit"].mw-ui-button:active,
input[type="submit"].mw-ui-button.active, a.mw-ui-button:active,
a.mw-ui-button.active {
+.mw-ui-button:active, .mw-ui-button.active {
background-image: none;
background-color: #c1c1c1;
text-shadow: none;
}
/* line 54, ../scss/mixins/_effects.scss */
-button.mw-ui-button:disabled, button.mw-ui-button.disabled,
input[type="submit"].mw-ui-button:disabled,
input[type="submit"].mw-ui-button.disabled, a.mw-ui-button:disabled,
a.mw-ui-button.disabled {
+.mw-ui-button:disabled, .mw-ui-button.disabled {
background-image: none;
background-color: #c9c9c9;
opacity: 0.5;
text-shadow: none;
}
-/* line 39, ../scss/components/default/_buttons.scss */
-button.mw-ui-button:disabled, button.mw-ui-button.disabled,
input[type="submit"].mw-ui-button:disabled,
input[type="submit"].mw-ui-button.disabled, a.mw-ui-button:disabled,
a.mw-ui-button.disabled {
+/* line 33, ../scss/components/default/_buttons.scss */
+.mw-ui-button:disabled, .mw-ui-button.disabled {
cursor: default;
}
-/* line 45, ../scss/components/default/_buttons.scss */
-button.mw-ui-button.big, input[type="submit"].mw-ui-button.big,
a.mw-ui-button.big {
+/* line 39, ../scss/components/default/_buttons.scss */
+.mw-ui-button.big {
font-size: 1.3em;
}
-/* line 50, ../scss/components/default/_buttons.scss */
-button.mw-ui-button.block, input[type="submit"].mw-ui-button.block,
a.mw-ui-button.block {
+/* line 44, ../scss/components/default/_buttons.scss */
+.mw-ui-button.block {
display: block;
width: 100%;
}
-/* line 59, ../scss/components/default/_buttons.scss */
-.mw-ui-button-group button,
-.mw-ui-button-group input[type="submit"],
-.mw-ui-button-group a {
+/* line 51, ../scss/components/default/_buttons.scss */
+.mw-ui-button-group > * {
-webkit-border-radius: 0;
-moz-border-radius: 0;
-ms-border-radius: 0;
@@ -109,10 +107,8 @@
border-radius: 0;
float: left;
}
-/* line 63, ../scss/components/default/_buttons.scss */
-.mw-ui-button-group button:first-child,
-.mw-ui-button-group input[type="submit"]:first-child,
-.mw-ui-button-group a:first-child {
+/* line 55, ../scss/components/default/_buttons.scss */
+.mw-ui-button-group > *:first-child {
-moz-border-radius-topleft: 3px;
-webkit-border-top-left-radius: 3px;
border-top-left-radius: 3px;
@@ -120,10 +116,8 @@
-webkit-border-bottom-left-radius: 3px;
border-bottom-left-radius: 3px;
}
-/* line 68, ../scss/components/default/_buttons.scss */
-.mw-ui-button-group button:last-child,
-.mw-ui-button-group input[type="submit"]:last-child,
-.mw-ui-button-group a:last-child {
+/* line 60, ../scss/components/default/_buttons.scss */
+.mw-ui-button-group > *:last-child {
-moz-border-radius-topright: 3px;
-webkit-border-top-right-radius: 3px;
border-top-right-radius: 3px;
@@ -133,7 +127,7 @@
}
/* line 7, ../scss/components/vector/_buttons.scss */
-button.mw-ui-button.blue, button.mw-ui-button.primary,
input[type="submit"].mw-ui-button.blue,
input[type="submit"].mw-ui-button.primary, a.mw-ui-button.blue,
a.mw-ui-button.primary {
+.mw-ui-button.blue, .mw-ui-button.primary {
background-color: #3366bb;
*background-color: #3366bb;
*zoom: 1;
@@ -148,7 +142,7 @@
border: 1px solid #3162b3;
}
/* line 38, ../scss/mixins/_effects.scss */
-button.mw-ui-button.blue:hover, button.mw-ui-button.blue.hover,
button.mw-ui-button.primary:hover, button.mw-ui-button.primary.hover,
input[type="submit"].mw-ui-button.blue:hover,
input[type="submit"].mw-ui-button.blue.hover,
input[type="submit"].mw-ui-button.primary:hover,
input[type="submit"].mw-ui-button.primary.hover, a.mw-ui-button.blue:hover,
a.mw-ui-button.blue.hover, a.mw-ui-button.primary:hover,
a.mw-ui-button.primary.hover {
+.mw-ui-button.blue:hover, .mw-ui-button.blue.hover,
.mw-ui-button.primary:hover, .mw-ui-button.primary.hover {
background-color: #4779cd;
*background-color: #4779cd;
*zoom: 1;
@@ -161,20 +155,20 @@
text-decoration: none;
}
/* line 44, ../scss/mixins/_effects.scss */
-button.mw-ui-button.blue:active, button.mw-ui-button.blue.active,
button.mw-ui-button.primary:active, button.mw-ui-button.primary.active,
input[type="submit"].mw-ui-button.blue:active,
input[type="submit"].mw-ui-button.blue.active,
input[type="submit"].mw-ui-button.primary:active,
input[type="submit"].mw-ui-button.primary.active, a.mw-ui-button.blue:active,
a.mw-ui-button.blue.active, a.mw-ui-button.primary:active,
a.mw-ui-button.primary.active {
+.mw-ui-button.blue:active, .mw-ui-button.blue.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 */
-button.mw-ui-button.blue:disabled, button.mw-ui-button.blue.disabled,
button.mw-ui-button.primary:disabled, button.mw-ui-button.primary.disabled,
input[type="submit"].mw-ui-button.blue:disabled,
input[type="submit"].mw-ui-button.blue.disabled,
input[type="submit"].mw-ui-button.primary:disabled,
input[type="submit"].mw-ui-button.primary.disabled,
a.mw-ui-button.blue:disabled, a.mw-ui-button.blue.disabled,
a.mw-ui-button.primary:disabled, a.mw-ui-button.primary.disabled {
+.mw-ui-button.blue:disabled, .mw-ui-button.blue.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 */
-button.mw-ui-button.green, button.mw-ui-button.constructive,
input[type="submit"].mw-ui-button.green,
input[type="submit"].mw-ui-button.constructive, a.mw-ui-button.green,
a.mw-ui-button.constructive {
+.mw-ui-button.green, .mw-ui-button.constructive {
background-color: #27aa65;
*background-color: #27aa65;
*zoom: 1;
@@ -189,7 +183,7 @@
border: 1px solid #25a260;
}
/* line 38, ../scss/mixins/_effects.scss */
-button.mw-ui-button.green:hover, button.mw-ui-button.green.hover,
button.mw-ui-button.constructive:hover, button.mw-ui-button.constructive.hover,
input[type="submit"].mw-ui-button.green:hover,
input[type="submit"].mw-ui-button.green.hover,
input[type="submit"].mw-ui-button.constructive:hover,
input[type="submit"].mw-ui-button.constructive.hover,
a.mw-ui-button.green:hover, a.mw-ui-button.green.hover,
a.mw-ui-button.constructive:hover, a.mw-ui-button.constructive.hover {
+.mw-ui-button.green:hover, .mw-ui-button.green.hover,
.mw-ui-button.constructive:hover, .mw-ui-button.constructive.hover {
background-color: #2ec977;
*background-color: #2ec977;
*zoom: 1;
@@ -202,20 +196,20 @@
text-decoration: none;
}
/* line 44, ../scss/mixins/_effects.scss */
-button.mw-ui-button.green:active, button.mw-ui-button.green.active,
button.mw-ui-button.constructive:active,
button.mw-ui-button.constructive.active,
input[type="submit"].mw-ui-button.green:active,
input[type="submit"].mw-ui-button.green.active,
input[type="submit"].mw-ui-button.constructive:active,
input[type="submit"].mw-ui-button.constructive.active,
a.mw-ui-button.green:active, a.mw-ui-button.green.active,
a.mw-ui-button.constructive:active, a.mw-ui-button.constructive.active {
+.mw-ui-button.green:active, .mw-ui-button.green.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 */
-button.mw-ui-button.green:disabled, button.mw-ui-button.green.disabled,
button.mw-ui-button.constructive:disabled,
button.mw-ui-button.constructive.disabled,
input[type="submit"].mw-ui-button.green:disabled,
input[type="submit"].mw-ui-button.green.disabled,
input[type="submit"].mw-ui-button.constructive:disabled,
input[type="submit"].mw-ui-button.constructive.disabled,
a.mw-ui-button.green:disabled, a.mw-ui-button.green.disabled,
a.mw-ui-button.constructive:disabled, a.mw-ui-button.constructive.disabled {
+.mw-ui-button.green:disabled, .mw-ui-button.green.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 */
-button.mw-ui-button.red, button.mw-ui-button.destructive,
input[type="submit"].mw-ui-button.red,
input[type="submit"].mw-ui-button.destructive, a.mw-ui-button.red,
a.mw-ui-button.destructive {
+.mw-ui-button.red, .mw-ui-button.destructive {
background-color: #cc0000;
*background-color: #cc0000;
*zoom: 1;
@@ -230,7 +224,7 @@
border: 1px solid #c20000;
}
/* line 38, ../scss/mixins/_effects.scss */
-button.mw-ui-button.red:hover, button.mw-ui-button.red.hover,
button.mw-ui-button.destructive:hover, button.mw-ui-button.destructive.hover,
input[type="submit"].mw-ui-button.red:hover,
input[type="submit"].mw-ui-button.red.hover,
input[type="submit"].mw-ui-button.destructive:hover,
input[type="submit"].mw-ui-button.destructive.hover, a.mw-ui-button.red:hover,
a.mw-ui-button.red.hover, a.mw-ui-button.destructive:hover,
a.mw-ui-button.destructive.hover {
+.mw-ui-button.red:hover, .mw-ui-button.red.hover,
.mw-ui-button.destructive:hover, .mw-ui-button.destructive.hover {
background-color: #f20000;
*background-color: #f20000;
*zoom: 1;
@@ -243,13 +237,13 @@
text-decoration: none;
}
/* line 44, ../scss/mixins/_effects.scss */
-button.mw-ui-button.red:active, button.mw-ui-button.red.active,
button.mw-ui-button.destructive:active, button.mw-ui-button.destructive.active,
input[type="submit"].mw-ui-button.red:active,
input[type="submit"].mw-ui-button.red.active,
input[type="submit"].mw-ui-button.destructive:active,
input[type="submit"].mw-ui-button.destructive.active,
a.mw-ui-button.red:active, a.mw-ui-button.red.active,
a.mw-ui-button.destructive:active, a.mw-ui-button.destructive.active {
+.mw-ui-button.red:active, .mw-ui-button.red.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 */
-button.mw-ui-button.red:disabled, button.mw-ui-button.red.disabled,
button.mw-ui-button.destructive:disabled,
button.mw-ui-button.destructive.disabled,
input[type="submit"].mw-ui-button.red:disabled,
input[type="submit"].mw-ui-button.red.disabled,
input[type="submit"].mw-ui-button.destructive:disabled,
input[type="submit"].mw-ui-button.destructive.disabled,
a.mw-ui-button.red:disabled, a.mw-ui-button.red.disabled,
a.mw-ui-button.destructive:disabled, a.mw-ui-button.destructive.disabled {
+.mw-ui-button.red:disabled, .mw-ui-button.red.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/default/_buttons.scss
b/modules/scss/components/default/_buttons.scss
index b036a2d..77335dc 100644
--- a/modules/scss/components/default/_buttons.scss
+++ b/modules/scss/components/default/_buttons.scss
@@ -1,13 +1,7 @@
-// Button selector config
-$buttonSelectors: append-selector(
- 'button, input[type="submit"], a', // Tags that are 'buttons'
- '.mw-ui-button' // Apply this class to above tags
-);
-
$buttonBorderRadius: 3px;
// Button styling
-#{$buttonSelectors} {
+.mw-ui-button {
// Container layout
@include inline-block;
padding: 0.4em 1em 0.4em 1em;
@@ -54,9 +48,7 @@
}
// Button groups
-.mw-ui-button-group button,
-.mw-ui-button-group input[type="submit"],
-.mw-ui-button-group a {
+.mw-ui-button-group > * {
@include border-radius(0);
float: left;
diff --git a/modules/scss/components/vector/_buttons.scss
b/modules/scss/components/vector/_buttons.scss
index c05ccd3..0ee721a 100644
--- a/modules/scss/components/vector/_buttons.scss
+++ b/modules/scss/components/vector/_buttons.scss
@@ -1,6 +1,6 @@
@import "../default/buttons"; // Layer Vector on top of the default settings.
-#{$buttonSelectors} {
+.mw-ui-button {
// Button colors
// -----------------------------------------
&.blue,
--
To view, visit https://gerrit.wikimedia.org/r/57650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9bbe60ab738499e32d7fb92e070b0db0aed75f56
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Agora
Gerrit-Branch: master
Gerrit-Owner: Massaf <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Spage <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
