From: jrobson <jrobson@wikimedia.org>
Date: Mon, 28 Oct 2013 18:59:05 +0000 (-0700)
Subject: Add correct font color override to beta variables
X-Git-Tag: 1.31.0-rc.0~18368
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=c6c3241806f819ae399d977fa1526450239b4898;p=lhc%2Fweb%2Fwiklou.git

Add correct font color override to beta variables

Note that originally the font color was specified incorrectly in
variables.less (fixed in I118215e7578e8af94a6909988620dcf04805d14a)

This restores the color to how it should be in beta
Also rename variable as the name is very misleading - it only applies
to the content

Change-Id: Iff397075ef4d11b6f815d8a596ed249d2708398a
---

diff --git a/skins/vector/beta/variables.less b/skins/vector/beta/variables.less
index 34627950ab..08e662dc06 100644
--- a/skins/vector/beta/variables.less
+++ b/skins/vector/beta/variables.less
@@ -1,10 +1,10 @@
 @html-font-size: 90%;
 
 @body-font-size: inherit;
-@body-font-color: inherit;
 
 // Page content
 @content-font-family: "Helvetica Neue", "Helvetica", "Nimbus Sans L", "Arial", "Liberation Sans", sans-serif;
+@content-font-color: #252525;
 @content-font-size: 0.9em;
 @content-line-height: inherit;
 @content-padding: 1em;
diff --git a/skins/vector/screen.less b/skins/vector/screen.less
index f5cf5e5dc1..de5fd18feb 100644
--- a/skins/vector/screen.less
+++ b/skins/vector/screen.less
@@ -37,7 +37,7 @@ div#content {
 	/* Merge the border with tabs' one (in their background image) */
 	margin-top: -1px;
 	background-color: white;
-	color: @body-font-color;
+	color: @content-font-color;
 	direction: ltr;
 }
 /* Hide, but keep accessible for screen-readers */
diff --git a/skins/vector/variables.less b/skins/vector/variables.less
index 197485c6b7..691e0fd598 100644
--- a/skins/vector/variables.less
+++ b/skins/vector/variables.less
@@ -1,10 +1,10 @@
 @html-font-size: 1em;
 
 @body-font-size: 1em;
-@body-font-color: black;
 
 // Page content
 @content-font-family: sans-serif;
+@content-font-color: black;
 @content-font-size: 0.8em;
 @content-line-height: 1.5em;
 @content-padding: 1.5em 1.5em 1.5em 1.75em;