jenkins-bot has submitted this change and it was merged.
Change subject: Make button text black for non-Vector buttons:
......................................................................
Make button text black for non-Vector buttons:
Also, don't do field styles for buttons since you'll generally want
mw-ui-button style instead.
Change-Id: I0bd69950cd07925268933c495c4e0fe0f07eef57
---
M resources/mediawiki.ui/mediawiki.ui.default.css
M resources/mediawiki.ui/mediawiki.ui.vector.css
M resources/mediawiki.ui/sourcefiles/scss/components/default/_forms.scss
M resources/mediawiki.ui/sourcefiles/scss/mixins/_effects.scss
4 files changed, 12 insertions(+), 10 deletions(-)
Approvals:
Matmarex: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mediawiki.ui/mediawiki.ui.default.css
b/resources/mediawiki.ui/mediawiki.ui.default.css
index 0f8d420..96c4eec 100644
--- a/resources/mediawiki.ui/mediawiki.ui.default.css
+++ b/resources/mediawiki.ui/mediawiki.ui.default.css
@@ -46,7 +46,7 @@
background-image: -moz-linear-gradient(top, #dcdcdc, #c9c9c9);
background-image: -o-linear-gradient(top, #dcdcdc, #c9c9c9);
background-image: linear-gradient(top, #dcdcdc, #c9c9c9);
- color: #4a4a4a;
+ color: black;
text-shadow: 0 1px 1px rgba(201, 201, 201, 0.3);
border: 1px solid #c4c4c4;
-webkit-border-radius: 3px;
@@ -157,8 +157,8 @@
margin: 0;
width: 100%;
}
-/* line 34, sourcefiles/scss/components/default/_forms.scss */
-.mw-ui-vform > div input {
+/* line 36, sourcefiles/scss/components/default/_forms.scss */
+.mw-ui-vform > div
input:not([type=button]):not([type=submit]):not([type=file]) {
outline: 0;
border-style: solid;
border-width: 1px;
@@ -167,7 +167,7 @@
padding: 0.35em 0 0.35em 0.5em;
}
/* line 12, sourcefiles/scss/mixins/_forms.scss */
-.mw-ui-vform > div input:focus {
+.mw-ui-vform > div
input:not([type=button]):not([type=submit]):not([type=file]):focus {
box-shadow: #4091ed 0px 0px 5px;
border-color: #4091ed;
}
diff --git a/resources/mediawiki.ui/mediawiki.ui.vector.css
b/resources/mediawiki.ui/mediawiki.ui.vector.css
index 9826526..a556c79 100644
--- a/resources/mediawiki.ui/mediawiki.ui.vector.css
+++ b/resources/mediawiki.ui/mediawiki.ui.vector.css
@@ -45,7 +45,7 @@
background-image: -moz-linear-gradient(top, #dcdcdc, #c9c9c9);
background-image: -o-linear-gradient(top, #dcdcdc, #c9c9c9);
background-image: linear-gradient(top, #dcdcdc, #c9c9c9);
- color: #4a4a4a;
+ color: black;
text-shadow: 0 1px 1px rgba(201, 201, 201, 0.3);
border: 1px solid #c4c4c4;
-webkit-border-radius: 3px;
@@ -286,8 +286,8 @@
margin: 0;
width: 100%;
}
-/* line 34, sourcefiles/scss/components/default/_forms.scss */
-.mw-ui-vform > div input {
+/* line 36, sourcefiles/scss/components/default/_forms.scss */
+.mw-ui-vform > div
input:not([type=button]):not([type=submit]):not([type=file]) {
outline: 0;
border-style: solid;
border-width: 1px;
@@ -296,7 +296,7 @@
padding: 0.35em 0 0.35em 0.5em;
}
/* line 12, sourcefiles/scss/mixins/_forms.scss */
-.mw-ui-vform > div input:focus {
+.mw-ui-vform > div
input:not([type=button]):not([type=submit]):not([type=file]):focus {
box-shadow: #4091ed 0px 0px 5px;
border-color: #4091ed;
}
diff --git
a/resources/mediawiki.ui/sourcefiles/scss/components/default/_forms.scss
b/resources/mediawiki.ui/sourcefiles/scss/components/default/_forms.scss
index 8bbe3c2..dfcd36f 100644
--- a/resources/mediawiki.ui/sourcefiles/scss/components/default/_forms.scss
+++ b/resources/mediawiki.ui/sourcefiles/scss/components/default/_forms.scss
@@ -31,7 +31,9 @@
width: 100%;
}
- input {
+ // We exclude these because they'll generally use mw-ui-button.
+ // Otherwise, we'll unintentionally override that.
+ input:not([type=button]):not([type=submit]):not([type=file]), {
@include agora-field-styling; // mixins/_forms.scss
}
diff --git a/resources/mediawiki.ui/sourcefiles/scss/mixins/_effects.scss
b/resources/mediawiki.ui/sourcefiles/scss/mixins/_effects.scss
index 03fae1b..2efff82 100644
--- a/resources/mediawiki.ui/sourcefiles/scss/mixins/_effects.scss
+++ b/resources/mediawiki.ui/sourcefiles/scss/mixins/_effects.scss
@@ -25,7 +25,7 @@
@include vertical-gradient(lighten($baseColor, 7.5%), $baseColor);
@if $baseColor == $agoraGray {
- color: darken($baseColor, 50%);
+ color: black;
@include text-shadow(0 1px 1px rgba($baseColor, 0.3));
} @else {
color: white;
--
To view, visit https://gerrit.wikimedia.org/r/66044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0bd69950cd07925268933c495c4e0fe0f07eef57
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: Isarra <zhoris...@gmail.com>
Gerrit-Reviewer: Matmarex <matma....@gmail.com>
Gerrit-Reviewer: Spage <sp...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
