jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/359363 )
Change subject: Hygiene: Variable tweaks
......................................................................
Hygiene: Variable tweaks
* redColorBase is available in core. So use it.
* The table of contents padding bottom is derived arbitarily. It makes
more sense to derive it from the font size itself. headingMargin has
nothing to do with this value.
* Introduce more explicit @redLinkColor variable
* Update usages to use @colorErrorText in core
Change-Id: I322bfa6e6dd1e1fa54e1b16ca104be137b88217a
---
M minerva.less/minerva.variables.less
M mobile.less/mobile.variables.less
M resources/mobile.pagelist.styles/pagelist.less
M resources/mobile.talk.overlays/TalkOverlay.less
M resources/mobile.toc/toc.less
M resources/skins.minerva.content.styles/links.less
6 files changed, 8 insertions(+), 14 deletions(-)
Approvals:
Pmiazga: Looks good to me, approved
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/minerva.less/minerva.variables.less
b/minerva.less/minerva.variables.less
index 1be290f..6c922be 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -36,6 +36,7 @@
@semiTransparent: rgba( 0, 0, 0, 0.8 );
@linkColor: #002bb8;
+@redLinkColor: @colorErrorText;
@lastModifiedBarActiveBackgroundColor: #00af89;
@toastNotificationColor: @colorGray2;
diff --git a/mobile.less/mobile.variables.less
b/mobile.less/mobile.variables.less
index 7f3808a..e4980ff 100644
--- a/mobile.less/mobile.variables.less
+++ b/mobile.less/mobile.variables.less
@@ -25,8 +25,6 @@
@grayLight: @colorGray12;
@grayLightest: @colorGray14;
-// note this is also used for red links
-@redBase: @colorErrorText;
// information messages, e.g. empty watchlist message
@infoColor: @colorGray7;
// background color for help screens/tutorials
diff --git a/resources/mobile.pagelist.styles/pagelist.less
b/resources/mobile.pagelist.styles/pagelist.less
index c268f66..fa16190 100644
--- a/resources/mobile.pagelist.styles/pagelist.less
+++ b/resources/mobile.pagelist.styles/pagelist.less
@@ -144,11 +144,6 @@
margin-bottom: 0.65em;
}
}
-
- // something on watchlist that doesn't exist
- .title.new h3 {
- color: @redBase;
- }
}
// FIXME: combine with a similar pattern in modules/NotificationsOverlay.less
diff --git a/resources/mobile.talk.overlays/TalkOverlay.less
b/resources/mobile.talk.overlays/TalkOverlay.less
index bf96f6b..4a09f6f 100644
--- a/resources/mobile.talk.overlays/TalkOverlay.less
+++ b/resources/mobile.talk.overlays/TalkOverlay.less
@@ -6,7 +6,7 @@
.talk-overlay {
.error {
- border: solid 1px @redBase;
+ border: solid 1px @colorErrorText;
}
.comment {
diff --git a/resources/mobile.toc/toc.less b/resources/mobile.toc/toc.less
index 43faf3f..7097976 100644
--- a/resources/mobile.toc/toc.less
+++ b/resources/mobile.toc/toc.less
@@ -1,9 +1,5 @@
@import 'mobile.variables';
-// FIXME: `mobile.` LESS modules should not import `minerva.` LESS modules.
-// Move Minerva specific rules into skinStyles.
-@import 'minerva.variables';
-
@paddingHorizontal: 24px;
@iconSize: 16px;
@iconHeadingGap: 12px;
@@ -40,7 +36,7 @@
font-size: ( 7 * @fontSize ) / 8;
width: auto;
> ul {
- padding-bottom: @fontSize + @headingMargin;
+ padding-bottom: @fontSize + 0.5em;
}
ul {
diff --git a/resources/skins.minerva.content.styles/links.less
b/resources/skins.minerva.content.styles/links.less
index 5153b86..5e2b599 100644
--- a/resources/skins.minerva.content.styles/links.less
+++ b/resources/skins.minerva.content.styles/links.less
@@ -21,7 +21,11 @@
&.new,
&.new:visited,
&.new:hover {
- color: @redBase;
+ color: @redLinkColor;
+ // Take care of headings in page lists.
+ > * {
+ color: @redLinkColor;
+ }
}
&.external {
--
To view, visit https://gerrit.wikimedia.org/r/359363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I322bfa6e6dd1e1fa54e1b16ca104be137b88217a
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Pmiazga <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
