Merge branch 'dev' into next

This commit is contained in:
chenjiahan
2020-09-28 11:46:26 +08:00
72 changed files with 259 additions and 243 deletions
+3 -3
View File
@@ -14,7 +14,7 @@ app.use(Icon);
### Basic Usage
Use `name` prop to set icon name or icon URL
Use `name` prop to set icon name or icon URL.
```html
<van-icon name="chat-o" />
@@ -35,7 +35,7 @@ Use `badge` prop, the badge will be displayed in the upper right corner of the i
### Icon Color
Use `color` prop to set icon color
Use `color` prop to set icon color.
```html
<van-icon name="chat-o" color="#1989fa" />
@@ -44,7 +44,7 @@ Use `color` prop to set icon color
### Icon Size
Use `size` prop to set icon size
Use `size` prop to set icon size.
```html
<van-icon name="chat-o" size="40" /> <van-icon name="chat-o" size="3rem" />