Icon: Adding font-display to @font-face declaration (#16805)

logustra · ziyoung · commit f4df25225359 · 2019-07-31T11:24:21.000+08:00
diff --git a/packages/theme-chalk/src/common/var.scss b/packages/theme-chalk/src/common/var.scss
@@ -104,6 +104,7 @@ $--fill-base: $--color-white !default;
 /* Typography
 -------------------------- */
 $--font-path: 'fonts' !default;
+$--font-display: 'auto' !default;
 /// fontSize|1|Font Size|0
 $--font-size-extra-large: 20px !default;
 /// fontSize|1|Font Size|0
diff --git a/packages/theme-chalk/src/icon.scss b/packages/theme-chalk/src/icon.scss
@@ -5,7 +5,8 @@
   src: url('#{$--font-path}/element-icons.woff') format('woff'), /* chrome, firefox */
        url('#{$--font-path}/element-icons.ttf') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
   font-weight: normal;
-  font-style: normal
+  font-display: $--font-display;
+  font-style: normal;
 }
 
 [class^="el-icon-"], [class*=" el-icon-"] {

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@`
`5`	`5`	`src: url('#{$--font-path}/element-icons.woff') format('woff'), /* chrome, firefox */`
`6`	`6`	`url('#{$--font-path}/element-icons.ttf') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/`
`7`	`7`	`font-weight: normal;`
`8`		`- font-style: normal`
	`8`	`+ font-display: $--font-display;`
	`9`	`+ font-style: normal;`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`[class^="el-icon-"], [class*=" el-icon-"] {`