Merge branch '2.x' into dev

2020-12-01 10:12:54 +08:00
parent d0c4c26d75 b57f7e9d98
commit 28afc8a521
48 changed files with 259 additions and 178 deletions
@@ -38,8 +38,8 @@ Use `badge` prop, the badge will be displayed in the upper right corner of the i
 Use `color` prop to set icon color.

 ```html
-<van-icon name="chat-o" color="#1989fa" />
-<van-icon name="chat-o" color="#07c160" />
+<van-icon name="cart-o" color="#1989fa" />
+<van-icon name="fire-o" color="#ee0a24" />
 ```

 ### Icon Size