From 996447c772a084ec17193ed7ce0252e08e94a1b8 Mon Sep 17 00:00:00 2001
From: qianzhaoyan <779547508@qq.com>
Date: Thu, 22 Mar 2018 16:19:19 +0800
Subject: [PATCH 1/2] [Doc] add custom Icon directions (#754)

---
 docs/markdown/en-US/icon.md | 30 ++++++++++++++++++++++++++++++
 docs/markdown/zh-CN/icon.md | 28 ++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/docs/markdown/en-US/icon.md b/docs/markdown/en-US/icon.md
index 0506c74a9..c9d9a14b1 100644
--- a/docs/markdown/en-US/icon.md
+++ b/docs/markdown/en-US/icon.md
@@ -23,6 +23,36 @@ Icon uses font file in `yzcdn.cn` by default，if you want to use the local font
 import 'vant/lib/vant-css/icon-local.css';
 ```
 
+#### Use custom font
+Add more custom icon
+
+[Demo](https://github.com/qianzhaoy/vant--mobile-mall/blob/master/src/assets/scss/iconfont/iconfont.css)
+
+```css
+@font-face {
+	font-family: "iconfont";
+	src: url('./iconfont.ttf') format('truetype');
+}
+
+@font-face {
+	font-family: "vanIcon";
+	src: url(https://b.yzcdn.cn/zanui/icon/vant-icon-4c3245.ttf) format('truetype');
+}
+
+.van-icon {
+	position: relative;
+	font-family: "iconfont", "vanIcon" !important;
+	font-size: 14px;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.van-icon-success:before {
+	content: "\e626";
+}
+```
+
 ### API
 
 | Attribute | Description | Type | Default | Accepted Values |
diff --git a/docs/markdown/zh-CN/icon.md b/docs/markdown/zh-CN/icon.md
index f2c545774..54d2bd0c5 100644
--- a/docs/markdown/zh-CN/icon.md
+++ b/docs/markdown/zh-CN/icon.md
@@ -23,6 +23,34 @@ Icon 组件默认引用 `yzcdn.cn` 域名下的字体文件，如果想要使用
 import 'vant/lib/vant-css/icon-local.css';
 ```
 
+#### 自定义字体
+如果我们的Icon数量无法满足你的需求，可以用以下方法，保留原本Icon的情况下，增加更多你想要的Icon
+
+[Demo地址](https://github.com/qianzhaoy/vant--mobile-mall/blob/master/src/assets/scss/iconfont/iconfont.css)
+```css
+@font-face {
+	font-family: "iconfont";
+	src: url('./iconfont.ttf') format('truetype');
+}
+
+@font-face {
+	font-family: "vanIcon";
+	src: url(https://b.yzcdn.cn/zanui/icon/vant-icon-4c3245.ttf) format('truetype');
+}
+
+.van-icon {
+	position: relative;
+	font-family: "iconfont", "vanIcon" !important;
+	font-size: 14px;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.van-icon-success:before {
+	content: "\e626";
+}
+```
 
 ### API
 

From a0bed46a638b54406a7cc06560af11ff8c50f3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Thu, 22 Mar 2018 16:32:13 +0800
Subject: [PATCH 2/2] [Doc] improve custom icon documentation

---
 docs/markdown/en-US/icon.md | 29 ++++++++++-------------------
 docs/markdown/zh-CN/icon.md | 29 +++++++++++------------------
 2 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/docs/markdown/en-US/icon.md b/docs/markdown/en-US/icon.md
index c9d9a14b1..f08ca6fd9 100644
--- a/docs/markdown/en-US/icon.md
+++ b/docs/markdown/en-US/icon.md
@@ -23,36 +23,27 @@ Icon uses font file in `yzcdn.cn` by default，if you want to use the local font
 import 'vant/lib/vant-css/icon-local.css';
 ```
 
-#### Use custom font
-Add more custom icon
-
-[Demo](https://github.com/qianzhaoy/vant--mobile-mall/blob/master/src/assets/scss/iconfont/iconfont.css)
+#### Add custom iconfont
 
 ```css
 @font-face {
-	font-family: "iconfont";
-	src: url('./iconfont.ttf') format('truetype');
-}
-
-@font-face {
-	font-family: "vanIcon";
-	src: url(https://b.yzcdn.cn/zanui/icon/vant-icon-4c3245.ttf) format('truetype');
+  font-family: 'custom-iconfont';
+  src: url('./iconfont.ttf') format('truetype');
 }
 
 .van-icon {
-	position: relative;
-	font-family: "iconfont", "vanIcon" !important;
-	font-size: 14px;
-	font-style: normal;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
+  font-family: 'vant-icon', 'custom-iconfont' !important;
 }
 
-.van-icon-success:before {
-	content: "\e626";
+.van-icon-extra:before {
+  content: '\e626';
 }
 ```
 
+```html
+<van-icon name="extra" />
+```
+
 ### API
 
 | Attribute | Description | Type | Default | Accepted Values |
diff --git a/docs/markdown/zh-CN/icon.md b/docs/markdown/zh-CN/icon.md
index 54d2bd0c5..4eb1f29e1 100644
--- a/docs/markdown/zh-CN/icon.md
+++ b/docs/markdown/zh-CN/icon.md
@@ -23,35 +23,28 @@ Icon 组件默认引用 `yzcdn.cn` 域名下的字体文件，如果想要使用
 import 'vant/lib/vant-css/icon-local.css';
 ```
 
-#### 自定义字体
-如果我们的Icon数量无法满足你的需求，可以用以下方法，保留原本Icon的情况下，增加更多你想要的Icon
+#### 自定义图标
+如果需要在现有 Icon 的基础上使用更多图标，可以引入你需要的 iconfont 对应的 ttf 文件和样式，之后就可以在 Icon 组件中直接使用
 
-[Demo地址](https://github.com/qianzhaoy/vant--mobile-mall/blob/master/src/assets/scss/iconfont/iconfont.css)
 ```css
 @font-face {
-	font-family: "iconfont";
-	src: url('./iconfont.ttf') format('truetype');
-}
-
-@font-face {
-	font-family: "vanIcon";
-	src: url(https://b.yzcdn.cn/zanui/icon/vant-icon-4c3245.ttf) format('truetype');
+  font-family: 'custom-iconfont';
+  src: url('./iconfont.ttf') format('truetype');
 }
 
 .van-icon {
-	position: relative;
-	font-family: "iconfont", "vanIcon" !important;
-	font-size: 14px;
-	font-style: normal;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
+  font-family: 'vant-icon', 'custom-iconfont' !important;
 }
 
-.van-icon-success:before {
-	content: "\e626";
+.van-icon-extra:before {
+  content: '\e626';
 }
 ```
 
+```html
+<van-icon name="extra" />
+```
+
 ### API
 
 | 参数 | 说明 | 类型 | 默认值 | 可选值 |