Merge branch '2.x' into dev

2020-11-08 17:02:26 +08:00
parent 1022969ae4 85e1548fc5
commit f85ebfb222
12 changed files with 137 additions and 54 deletions
@@ -58,6 +58,8 @@ Icon uses font file in `yzcdn.cn` by default，if you want to use the local font
 import 'vant/lib/icon/local.css';
 ```

+> Tips: Starting from version 2.10.13, Vant will use local font files in woff2 format by default
+
 ### Add custom iconfont

 ```css