From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 15 Oct 2013 16:34:44 +0000 (+0000)
Subject: Merge "Vector: New beta module with new typography styles"
X-Git-Tag: 1.31.0-rc.0~18513
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=da081e4857c7f85787dbf318ffbfcb12e214ade2;p=lhc%2Fweb%2Fwiklou.git

Merge "Vector: New beta module with new typography styles"
---

da081e4857c7f85787dbf318ffbfcb12e214ade2
diff --cc skins/vector/screen.less
index 97a04c7e5f,f919bda7b5..bfcc35cc6a
--- a/skins/vector/screen.less
+++ b/skins/vector/screen.less
@@@ -9,9 -10,12 +9,12 @@@
   * the child selector. You can spot this by looking for the "OVERRIDDEN BY COMPLIANT BROWSERS" and
   * "IGNORED BY IE6" comments.
   */
 -@import "mediawiki.mixins.less";
 +@import "mediawiki.mixins";
  
  /* Framework */
+ html {
+ 	font-size: @html-font-size;
+ }
  html,
  body {
  	height: 100%;