From 66bcb6c2df71d6812011d6f26afe0b95f9e4c24a Mon Sep 17 00:00:00 2001 From: Jon Robson Date: Wed, 24 Aug 2022 15:31:26 +0100 Subject: [PATCH] Vector legacy no longer imports variables from Vector modern In f7f78023e we added new variables to the Vector 2022 variables that overrode the defaults, but forgot to preserve the defaults in Vector legacy. This resulted in changes documented in T213778#8181795 Going forward it makes sense to separate these. Bug: T213778 Change-Id: I5e4f1729fc0f41b21579807fc83a7dda9c3519ea (cherry picked from commit 2be7ce5c47fffe36a7a7526bebacbaeb3ebe00a1) --- .../mediawiki.skin.variables.less | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/resources/mediawiki.less.legacy/mediawiki.skin.variables.less b/resources/mediawiki.less.legacy/mediawiki.skin.variables.less index 715f9577..52a79a14 100644 --- a/resources/mediawiki.less.legacy/mediawiki.skin.variables.less +++ b/resources/mediawiki.less.legacy/mediawiki.skin.variables.less @@ -4,10 +4,23 @@ */ @import 'mediawiki.skin.defaults.less'; -@import '../mediawiki.less/mediawiki.skin.variables.less'; // Set pre July 2022 colors for links (T213778). @color-link: #0645ad; @color-link--visited: #0b0080; +@color-link--active: #faa700; @color-link-new: #ba0000; @color-link-new--visited: #a55858; + +// Note these colors are different from Vector 2022 for historic reasons: +@color-link-external: #36b; +@color-link-external--visited: #636; +@color-link-external--active: #b63; + +// Body content uses the user setting in browser / the system default sans-serif font: +// Arial on Windows, Roboto on Android. +// FIXME: Use WikimediaUI Base's OS specific default sans-serif fonts. +@font-family-sans: sans-serif; + +// Matches WikimediaUI Base and Codex, OOUI/wikimedia +@border-radius-base: 2px;