diff --git a/build/build-iconfont.js b/build/build-iconfont.js
index 3f21b53f9..65eba1a03 100644
--- a/build/build-iconfont.js
+++ b/build/build-iconfont.js
@@ -26,7 +26,7 @@ const ttf = `${config.name}-${md5}.ttf`;
// should install sketchtool first
// install guide: https://developer.sketchapp.com/guides/sketchtool/
shell.exec(
- `sketchtool export slices --formats=svg --overwriting=YES --save-for-web=YES --output=${svgDir} ${sketch}`
+ `/Applications/Sketch.app/Contents/Resources/sketchtool/bin/sketchtool export slices --formats=svg --overwriting=YES --save-for-web=YES --output=${svgDir} ${sketch}`
);
// remove previous ttf
diff --git a/packages/icon/assert/icons.sketch b/packages/icon/assert/icons.sketch
index f8ed27a79..52be1fd62 100644
Binary files a/packages/icon/assert/icons.sketch and b/packages/icon/assert/icons.sketch differ
diff --git a/packages/icon/config/index.js b/packages/icon/config/index.js
index 1d011cc69..e8e5d2b31 100644
--- a/packages/icon/config/index.js
+++ b/packages/icon/config/index.js
@@ -2,7 +2,7 @@ module.exports = {
name: 'vant-icon',
glyphs: [
{
- src: '关闭.svg',
+ src: 'close.svg',
css: 'close'
},
{
@@ -26,7 +26,7 @@ module.exports = {
css: 'question'
},
{
- src: '时钟.svg',
+ src: 'clock.svg',
css: 'clock'
},
{
@@ -74,7 +74,7 @@ module.exports = {
css: 'exchange'
},
{
- src: '其他分店.svg',
+ src: 'location.svg',
css: 'location'
},
{
@@ -141,6 +141,14 @@ module.exports = {
src: '已完成2.svg',
css: 'sign'
},
+ {
+ src: 'photo.svg',
+ css: 'photo'
+ },
+ {
+ src: 'idcard.svg',
+ css: 'idcard'
+ },
{
src: '首页.svg',
css: 'home'
@@ -149,18 +157,6 @@ module.exports = {
src: '包邮.svg',
css: 'free-postage'
},
- {
- src: '生日特权.svg',
- css: 'birthday-privilege'
- },
- {
- src: '会员日特权.svg',
- css: 'member-day-privilege'
- },
- {
- src: '余额明细.svg',
- css: 'balance-details'
- },
{
src: '返现记录.svg',
css: 'cash-back-record'
@@ -265,10 +261,6 @@ module.exports = {
src: '添加.svg',
css: 'add2'
},
- {
- src: '照片.svg',
- css: 'photo'
- },
{
src: '微信支付.svg',
css: 'wechat'
diff --git a/packages/icon/test/__snapshots__/demo.spec.js.snap b/packages/icon/test/__snapshots__/demo.spec.js.snap
index a1abffbd9..f2a2ad821 100644
--- a/packages/icon/test/__snapshots__/demo.spec.js.snap
+++ b/packages/icon/test/__snapshots__/demo.spec.js.snap
@@ -143,6 +143,14 @@ exports[`renders demo correctly 1`] = `
<i class="van-icon van-icon-sign" style="color:undefined;">
<!---->
</i> <span>sign</span></div>
+ <div class="van-col van-col--8">
+ <i class="van-icon van-icon-photo" style="color:undefined;">
+ <!---->
+ </i> <span>photo</span></div>
+ <div class="van-col van-col--8">
+ <i class="van-icon van-icon-idcard" style="color:undefined;">
+ <!---->
+ </i> <span>idcard</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-home" style="color:undefined;">
<!---->
@@ -151,18 +159,6 @@ exports[`renders demo correctly 1`] = `
<i class="van-icon van-icon-free-postage" style="color:undefined;">
<!---->
</i> <span>free-postage</span></div>
- <div class="van-col van-col--8">
- <i class="van-icon van-icon-birthday-privilege" style="color:undefined;">
- <!---->
- </i> <span>birthday-privilege</span></div>
- <div class="van-col van-col--8">
- <i class="van-icon van-icon-member-day-privilege" style="color:undefined;">
- <!---->
- </i> <span>member-day-privilege</span></div>
- <div class="van-col van-col--8">
- <i class="van-icon van-icon-balance-details" style="color:undefined;">
- <!---->
- </i> <span>balance-details</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-cash-back-record" style="color:undefined;">
<!---->
@@ -267,10 +263,6 @@ exports[`renders demo correctly 1`] = `
<i class="van-icon van-icon-add2" style="color:undefined;">
<!---->
</i> <span>add2</span></div>
- <div class="van-col van-col--8">
- <i class="van-icon van-icon-photo" style="color:undefined;">
- <!---->
- </i> <span>photo</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-wechat" style="color:undefined;">
<!---->
diff --git a/packages/icon/vant-icon-9b71af.ttf b/packages/icon/vant-icon-9b71af.ttf
deleted file mode 100644
index 26ae2a9e7..000000000
Binary files a/packages/icon/vant-icon-9b71af.ttf and /dev/null differ
diff --git a/packages/icon/vant-icon-eb8c95.ttf b/packages/icon/vant-icon-eb8c95.ttf
new file mode 100644
index 000000000..7b8fc2c71
Binary files /dev/null and b/packages/icon/vant-icon-eb8c95.ttf differ
diff --git a/packages/vant-css/src/icon-local.css b/packages/vant-css/src/icon-local.css
index a4b8fffae..bcb0ce131 100644
--- a/packages/vant-css/src/icon-local.css
+++ b/packages/vant-css/src/icon-local.css
@@ -2,5 +2,5 @@
font-style: normal;
font-weight: normal;
font-family: 'vant-icon';
- src: url('../icon/vant-icon-9b71af.ttf') format('truetype');
+ src: url('../icon/vant-icon-eb8c95.ttf') format('truetype');
}
diff --git a/packages/vant-css/src/icon.css b/packages/vant-css/src/icon.css
index 5cbc1898a..fcb78b146 100644
--- a/packages/vant-css/src/icon.css
+++ b/packages/vant-css/src/icon.css
@@ -4,7 +4,7 @@
font-style: normal;
font-weight: normal;
font-family: 'vant-icon';
- src: url('https://img.yzcdn.cn/vant/vant-icon-9b71af.ttf') format('truetype');
+ src: url('https://img.yzcdn.cn/vant/vant-icon-eb8c95.ttf') format('truetype');
}
.van-icon {
@@ -64,355 +64,347 @@
content: "\F006";
}
-.van-icon-balance-details::before {
+.van-icon-balance-pay::before {
content: "\F007";
}
-.van-icon-balance-pay::before {
+.van-icon-browsing-history::before {
content: "\F008";
}
-.van-icon-birthday-privilege::before {
+.van-icon-card::before {
content: "\F009";
}
-.van-icon-browsing-history::before {
+.van-icon-cart::before {
content: "\F00A";
}
-.van-icon-card::before {
+.van-icon-cash-back-record::before {
content: "\F00B";
}
-.van-icon-cart::before {
+.van-icon-cash-on-deliver::before {
content: "\F00C";
}
-.van-icon-cash-back-record::before {
+.van-icon-certificate::before {
content: "\F00D";
}
-.van-icon-cash-on-deliver::before {
+.van-icon-chat::before {
content: "\F00E";
}
-.van-icon-certificate::before {
+.van-icon-check::before {
content: "\F00F";
}
-.van-icon-chat::before {
+.van-icon-checked::before {
content: "\F010";
}
-.van-icon-check::before {
+.van-icon-clear::before {
content: "\F011";
}
-.van-icon-checked::before {
+.van-icon-clock::before {
content: "\F012";
}
-.van-icon-clear::before {
+.van-icon-close::before {
content: "\F013";
}
-.van-icon-clock::before {
+.van-icon-completed::before {
content: "\F014";
}
-.van-icon-close::before {
+.van-icon-contact::before {
content: "\F015";
}
-.van-icon-completed::before {
+.van-icon-coupon::before {
content: "\F016";
}
-.van-icon-contact::before {
+.van-icon-credit-pay::before {
content: "\F017";
}
-.van-icon-coupon::before {
+.van-icon-debit-pay::before {
content: "\F018";
}
-.van-icon-credit-pay::before {
+.van-icon-delete::before {
content: "\F019";
}
-.van-icon-debit-pay::before {
+.van-icon-description::before {
content: "\F01A";
}
-.van-icon-delete::before {
+.van-icon-discount::before {
content: "\F01B";
}
-.van-icon-description::before {
+.van-icon-ecard-pay::before {
content: "\F01C";
}
-.van-icon-discount::before {
+.van-icon-edit-data::before {
content: "\F01D";
}
-.van-icon-ecard-pay::before {
+.van-icon-edit::before {
content: "\F01E";
}
-.van-icon-edit-data::before {
+.van-icon-exchange-record::before {
content: "\F01F";
}
-.van-icon-edit::before {
+.van-icon-exchange::before {
content: "\F020";
}
-.van-icon-exchange-record::before {
+.van-icon-fail::before {
content: "\F021";
}
-.van-icon-exchange::before {
+.van-icon-free-postage::before {
content: "\F022";
}
-.van-icon-fail::before {
+.van-icon-gift-card-pay::before {
content: "\F023";
}
-.van-icon-free-postage::before {
+.van-icon-gift-card::before {
content: "\F024";
}
-.van-icon-gift-card-pay::before {
+.van-icon-gift::before {
content: "\F025";
}
-.van-icon-gift-card::before {
+.van-icon-gold-coin::before {
content: "\F026";
}
-.van-icon-gift::before {
+.van-icon-goods-collect::before {
content: "\F027";
}
-.van-icon-gold-coin::before {
+.van-icon-home::before {
content: "\F028";
}
-.van-icon-goods-collect::before {
+.van-icon-hot-sale::before {
content: "\F029";
}
-.van-icon-home::before {
+.van-icon-hot::before {
content: "\F02A";
}
-.van-icon-hot-sale::before {
+.van-icon-idcard::before {
content: "\F02B";
}
-.van-icon-hot::before {
+.van-icon-info-o::before {
content: "\F02C";
}
-.van-icon-info-o::before {
+.van-icon-like-o::before {
content: "\F02D";
}
-.van-icon-like-o::before {
+.van-icon-like::before {
content: "\F02E";
}
-.van-icon-like::before {
+.van-icon-location::before {
content: "\F02F";
}
-.van-icon-location::before {
+.van-icon-logistics::before {
content: "\F030";
}
-.van-icon-logistics::before {
+.van-icon-more-o::before {
content: "\F031";
}
-.van-icon-member-day-privilege::before {
+.van-icon-more::before {
content: "\F032";
}
-.van-icon-more-o::before {
+.van-icon-new-arrival::before {
content: "\F033";
}
-.van-icon-more::before {
+.van-icon-new::before {
content: "\F034";
}
-.van-icon-new-arrival::before {
+.van-icon-other-pay::before {
content: "\F035";
}
-.van-icon-new::before {
+.van-icon-passed::before {
content: "\F036";
}
-.van-icon-other-pay::before {
+.van-icon-password-not-view::before {
content: "\F037";
}
-.van-icon-passed::before {
+.van-icon-password-view::before {
content: "\F038";
}
-.van-icon-password-not-view::before {
+.van-icon-pause::before {
content: "\F039";
}
-.van-icon-password-view::before {
+.van-icon-peer-pay::before {
content: "\F03A";
}
-.van-icon-pause::before {
+.van-icon-pending-deliver::before {
content: "\F03B";
}
-.van-icon-peer-pay::before {
+.van-icon-pending-evaluate::before {
content: "\F03C";
}
-.van-icon-pending-deliver::before {
+.van-icon-pending-orders::before {
content: "\F03D";
}
-.van-icon-pending-evaluate::before {
+.van-icon-pending-payment::before {
content: "\F03E";
}
-.van-icon-pending-orders::before {
+.van-icon-phone::before {
content: "\F03F";
}
-.van-icon-pending-payment::before {
+.van-icon-photo::before {
content: "\F040";
}
-.van-icon-phone::before {
+.van-icon-photograph::before {
content: "\F041";
}
-.van-icon-photo::before {
+.van-icon-play::before {
content: "\F042";
}
-.van-icon-photograph::before {
+.van-icon-point-gift::before {
content: "\F043";
}
-.van-icon-play::before {
+.van-icon-points-mall::before {
content: "\F044";
}
-.van-icon-point-gift::before {
+.van-icon-points::before {
content: "\F045";
}
-.van-icon-points-mall::before {
+.van-icon-qr-invalid::before {
content: "\F046";
}
-.van-icon-points::before {
+.van-icon-qr::before {
content: "\F047";
}
-.van-icon-qr-invalid::before {
+.van-icon-question::before {
content: "\F048";
}
-.van-icon-qr::before {
+.van-icon-receive-gift::before {
content: "\F049";
}
-.van-icon-question::before {
+.van-icon-records::before {
content: "\F04A";
}
-.van-icon-receive-gift::before {
+.van-icon-search::before {
content: "\F04B";
}
-.van-icon-records::before {
+.van-icon-send-gift::before {
content: "\F04C";
}
-.van-icon-search::before {
+.van-icon-setting::before {
content: "\F04D";
}
-.van-icon-send-gift::before {
+.van-icon-share::before {
content: "\F04E";
}
-.van-icon-setting::before {
+.van-icon-shop-collect::before {
content: "\F04F";
}
-.van-icon-share::before {
+.van-icon-shop::before {
content: "\F050";
}
-.van-icon-shop-collect::before {
+.van-icon-shopping-cart::before {
content: "\F051";
}
-.van-icon-shop::before {
+.van-icon-sign::before {
content: "\F052";
}
-.van-icon-shopping-cart::before {
+.van-icon-stop::before {
content: "\F053";
}
-.van-icon-sign::before {
+.van-icon-success::before {
content: "\F054";
}
-.van-icon-stop::before {
+.van-icon-tosend::before {
content: "\F055";
}
-.van-icon-success::before {
+.van-icon-underway::before {
content: "\F056";
}
-.van-icon-tosend::before {
+.van-icon-upgrade::before {
content: "\F057";
}
-.van-icon-underway::before {
+.van-icon-value-card::before {
content: "\F058";
}
-.van-icon-upgrade::before {
+.van-icon-wap-home::before {
content: "\F059";
}
-.van-icon-value-card::before {
+.van-icon-wap-nav::before {
content: "\F05A";
}
-.van-icon-wap-home::before {
+.van-icon-warn::before {
content: "\F05B";
}
-.van-icon-wap-nav::before {
+.van-icon-wechat::before {
content: "\F05C";
}
-.van-icon-warn::before {
- content: "\F05D";
-}
-
-.van-icon-wechat::before {
- content: "\F05E";
-}
-