Merge pull request #104 from Wikia/XW-2346

Weronika Rudnicka · web-flow · commit abd501adf5d4 · 2016-11-30T12:54:19.000+01:00
XW-2346 | removed font fallbacks for Chinese
diff --git a/app/templates/base-styles/typography.hbs b/app/templates/base-styles/typography.hbs
@@ -14,7 +14,7 @@
 <section>
 	<h2 id="font-family">Font Family</h2>
 	<p>For highest browser compatibility we decided to follow direction described in <a href="https://www.smashingmagazine.com/2015/11/using-system-ui-fonts-practical-guide/">Using System UI Fonts In Web Design: A Quick Practical Guide</a>. It provides a list of font-families for browsers to fallback. We listed font-families supported by major operating systems and finally we fall back to <code>sans-serif</code>. This way we can avoid web-font delivery process which would hit page performance.</p>
-	<code><span class="format-code">$wds-font-family</span>: 'Helvetica Neue', Helvetica, Arial, 'PingFang SC', 'Hiragino Sans GB', 冬青黑体, 'Microsoft YaHei', 微软雅黑体, sans-serif;</code>
+	<code><span class="format-code">$wds-font-family</span>: 'Helvetica Neue', Helvetica, Arial, sans-serif;</code>
 </section>
 
 <section>
diff --git a/dist/scss/wds-variables/_typography.scss b/dist/scss/wds-variables/_typography.scss
@@ -1,5 +1,5 @@
 // Font family - see https://www.smashingmagazine.com/2015/11/using-system-ui-fonts-practical-guide/
-$wds-font-family: 'Helvetica Neue', Helvetica, Arial, 'PingFang SC', 'Hiragino Sans GB', 冬青黑体, 'Microsoft YaHei', 微软雅黑体, sans-serif;
+$wds-font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
 
 // Line height
 $wds-line-height: 1.5em;
diff --git a/docs/assets/design-system.css b/docs/assets/design-system.css
diff --git a/docs/assets/design-system.js b/docs/assets/design-system.js
diff --git a/docs/index.html b/docs/index.html
@@ -8,7 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     
-<meta name="design-system/config/environment" content="%7B%22modulePrefix%22%3A%22design-system%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22/%22%2C%22locationType%22%3A%22hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%7D%2C%22APP%22%3A%7B%22name%22%3A%22design-system%22%2C%22version%22%3A%223.0.0+9b2045b0%22%7D%2C%22exportApplicationGlobal%22%3Afalse%7D" />
+<meta name="design-system/config/environment" content="%7B%22modulePrefix%22%3A%22design-system%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22/%22%2C%22locationType%22%3A%22hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%7D%2C%22APP%22%3A%7B%22name%22%3A%22design-system%22%2C%22version%22%3A%224.1.0%22%7D%2C%22exportApplicationGlobal%22%3Afalse%7D" />
 
     <link rel="stylesheet" href="/assets/vendor.css">
     <link rel="stylesheet" href="/assets/design-system.css">
diff --git a/style-guide/styles/wds-variables/_typography.scss b/style-guide/styles/wds-variables/_typography.scss
@@ -1,5 +1,5 @@
 // Font family - see https://www.smashingmagazine.com/2015/11/using-system-ui-fonts-practical-guide/
-$wds-font-family: 'Helvetica Neue', Helvetica, Arial, 'PingFang SC', 'Hiragino Sans GB', 冬青黑体, 'Microsoft YaHei', 微软雅黑体, sans-serif;
+$wds-font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
 
 // Line height
 $wds-line-height: 1.5em;
