Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Improvement] Icon: add info-o icon #648

Merged
merged 113 commits into from
Feb 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
a800067
[bugfix] Swipe: use translate2d to aviod iOS11 crash bug
chenjiahan Jan 8, 2018
7f05de8
[bugfix] Area: should valid data before get area list
chenjiahan Jan 9, 2018
f513de2
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 9, 2018
795981c
[bugfix] AddressEdit: setAreaCode now work
chenjiahan Jan 10, 2018
3526103
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 10, 2018
b43ee80
fix: test cases
chenjiahan Jan 10, 2018
af70f3a
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 10, 2018
5ad2d78
[Improvement] NavBar: add zIndex prop
chenjiahan Jan 10, 2018
11bbfb6
fix: code style
chenjiahan Jan 10, 2018
31c0324
[Improvement] Cell: adjust right padding of arrow
chenjiahan Jan 11, 2018
fce7dd1
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 11, 2018
f7cd072
[bugfix] Picker: change event not triggered when click option
chenjiahan Jan 11, 2018
13e26a5
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 11, 2018
d434818
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 17, 2018
00f370d
[Improvement] Dialog: add setDefaultOptions method
chenjiahan Jan 17, 2018
1735420
[Improvement] Toast: add setDefaultOptions method
chenjiahan Jan 17, 2018
c9f1ad3
Merge
chenjiahan Jan 17, 2018
1f60837
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 18, 2018
85b7d7b
[Doc] fix misspelling of NumberKeyboard
chenjiahan Jan 18, 2018
0b63746
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 18, 2018
368ffa5
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 18, 2018
0b52c73
[Improvement] Picker: add props to custom button text
chenjiahan Jan 18, 2018
f061291
[bugfix] Picker: misspelling of visibleItemCount
chenjiahan Jan 18, 2018
192b9e6
Merge
chenjiahan Jan 18, 2018
a762208
[Improvement] Sku: remove unnecessary codes
chenjiahan Jan 18, 2018
b1e672e
update dependencies
chenjiahan Jan 18, 2018
1fcad6e
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 18, 2018
2769f9b
fix: yarn.lock
chenjiahan Jan 19, 2018
df1daa3
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 19, 2018
c1c8e5f
[Improvement] CouponList: add exchangeMinLength prop
chenjiahan Jan 22, 2018
11df47a
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 22, 2018
b7e9837
[bugfix] Area: should not display city & county list when not select …
chenjiahan Jan 22, 2018
a3276ae
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 22, 2018
33e83fb
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 22, 2018
c66e671
[Improvement] Icon: update share icon
chenjiahan Jan 22, 2018
b4a3195
[Improvement] Button: add text prop
chenjiahan Jan 23, 2018
5c3bf39
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 23, 2018
8e78ab2
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 23, 2018
414418f
[Improvement] update dependencies
chenjiahan Jan 23, 2018
160fa5f
[Improvement] CouponList: support v-model & exchangeButtonLoading
chenjiahan Jan 23, 2018
7ab6996
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 23, 2018
1975353
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 23, 2018
949206b
[bugfix] Toast: work break
chenjiahan Jan 23, 2018
604f22b
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 24, 2018
7df4932
[bugfix] Tab: active not work
chenjiahan Jan 24, 2018
b4b573f
[Improvement] AddressEdit: add default slot
chenjiahan Jan 24, 2018
0368ecd
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 24, 2018
ddfdac1
[new feature] Uploader: support maxSize prop
chenjiahan Jan 24, 2018
9a466ac
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 24, 2018
0d8fd4a
Merge remote-tracking branch 'main/master' into dev
chenjiahan Jan 29, 2018
130fcca
[bugfix] Field: multi line label stye error
chenjiahan Jan 29, 2018
ab248a9
[Improvement] Sku: add getSkuData method
chenjiahan Jan 29, 2018
f9b7bad
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 29, 2018
fd64de8
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 29, 2018
4394319
[new feature] Toast: support multiple instance
chenjiahan Jan 29, 2018
40879e1
fix: reset toast message
chenjiahan Jan 29, 2018
2278b50
fix: toast message
chenjiahan Jan 29, 2018
be85f59
[Improvement] Area: add item-height & visible-item-count props
chenjiahan Jan 30, 2018
8b06173
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 30, 2018
40415d3
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 31, 2018
7f97ee3
[new feature] Dialog: support component call
chenjiahan Jan 31, 2018
ae33407
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Jan 31, 2018
6cf5b73
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 2, 2018
34c927e
[Improvement] Toast: adjust background color
chenjiahan Feb 2, 2018
d83131e
[Improvement] Tab: add title slot
chenjiahan Feb 2, 2018
0eb862d
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 2, 2018
5678957
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 2, 2018
4f45836
[bugfix] TreeSelect: arrow position error
chenjiahan Feb 2, 2018
03e88a4
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 2, 2018
90ab549
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 5, 2018
8260ed5
[bugfix] Picker: style error in some andriod devices
chenjiahan Feb 6, 2018
3cbd4cc
[new feature] Popup: support getContaienr
chenjiahan Feb 6, 2018
c0036bd
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 6, 2018
8cf8fd7
[Improvement] add van-ellipsis class
chenjiahan Feb 6, 2018
63aed74
[new feature] Loading: add circular type
chenjiahan Feb 7, 2018
47e1f6d
Merge
chenjiahan Feb 7, 2018
dedaf11
fix: loading demo
chenjiahan Feb 7, 2018
354957e
fix: loading test cases
chenjiahan Feb 7, 2018
667eebb
[new feature] Picker: add loading prop
chenjiahan Feb 7, 2018
9ed025a
Merge
chenjiahan Feb 7, 2018
5347d56
Merge
chenjiahan Feb 7, 2018
d3f12db
[Improvement] Loading: add size prop
chenjiahan Feb 7, 2018
5ee4e5f
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 7, 2018
030ee75
fix: loading test cases
chenjiahan Feb 7, 2018
0746a8a
[Improvement] Button: change loading icon
chenjiahan Feb 7, 2018
8c1f524
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 7, 2018
ace6ed8
[Improvement] Loading: change default type to circular
chenjiahan Feb 7, 2018
d2ff2eb
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 8, 2018
0c50800
[Improvement] Circle: optimzie linecap
chenjiahan Feb 8, 2018
8581042
[Improvement] PullRefresh: add refersh event
chenjiahan Feb 8, 2018
f6d74f5
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 8, 2018
e9d49a5
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 8, 2018
4024156
[Doc] optimzie demo display
chenjiahan Feb 8, 2018
c4411bf
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 8, 2018
a25eabf
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 9, 2018
61be0bc
[Doc] add build-in style document
chenjiahan Feb 9, 2018
7c7e057
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 11, 2018
dea6346
[bugfix] Stepper: change event error when clear input
chenjiahan Feb 11, 2018
c9328cd
[Improvement] Checkbox: remove unnecessary DOM
chenjiahan Feb 12, 2018
3a23cd1
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 12, 2018
1394140
fix: checkbox test cases
chenjiahan Feb 12, 2018
537fea3
[Doc] simplify build process
chenjiahan Feb 12, 2018
acbcfd4
Merge branch 'origin/dev' into dev
chenjiahan Feb 12, 2018
46944e2
simplify test config
chenjiahan Feb 12, 2018
a0ce066
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 12, 2018
8dfd12a
[Doc] optimzie router & remove unused code
chenjiahan Feb 12, 2018
6e35999
Merge
chenjiahan Feb 12, 2018
38b41a8
Merge
chenjiahan Feb 22, 2018
48caca9
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 22, 2018
59176fa
[bugfix] Button loading horizontal align
chenjiahan Feb 23, 2018
704984c
[Improvement] Popup: add click-overlay event
chenjiahan Feb 24, 2018
3a63efa
Merge remote-tracking branch 'main/dev' into dev
chenjiahan Feb 24, 2018
39195cf
[Improvement] Icon: add info-o icon
chenjiahan Feb 26, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file modified packages/vant-css/assets/icons.sketch
Binary file not shown.
16 changes: 10 additions & 6 deletions packages/vant-css/scripts/icon-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ module.exports = {
src: 'more-o.svg',
css: 'more-o'
},
{
src: 'info-o.svg',
css: 'info-o'
},
{
src: 'share.svg',
css: 'share'
Expand Down Expand Up @@ -205,6 +209,10 @@ module.exports = {
src: 'arrow-left.svg',
css: 'arrow-left'
},
{
src: '搜索.svg',
css: 'search'
},
{
src: '成功.svg',
css: 'success'
Expand All @@ -218,7 +226,7 @@ module.exports = {
css: 'add'
},
{
src: '选中.svg',
src: 'checked.svg',
css: 'checked'
},
{
Expand All @@ -245,10 +253,6 @@ module.exports = {
src: '照片.svg',
css: 'photo'
},
{
src: '搜索.svg',
css: 'search'
},
{
src: '清除搜索.svg',
css: 'clear'
Expand Down Expand Up @@ -330,7 +334,7 @@ module.exports = {
css: 'cash-on-deliver'
},
{
src: '进行中.svg',
src: 'underway.svg',
css: 'underway'
},
{
Expand Down
2 changes: 1 addition & 1 deletion packages/vant-css/src/icon-local.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
font-style: normal;
font-weight: normal;
font-family: 'vant-icon';
src: url('./vant-icon-dc7d92.ttf') format('truetype');
src: url('./vant-icon-1a68df.ttf') format('truetype');
}
101 changes: 52 additions & 49 deletions packages/vant-css/src/icon.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
font-style: normal;
font-weight: normal;
font-family: 'vant-icon';
src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-dc7d92.ttf') format('truetype');
src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-1a68df.ttf') format('truetype');
}

.van-icon {
Expand Down Expand Up @@ -171,147 +171,150 @@
.van-icon-hot:before {
content: "\F02C";
}
.van-icon-like-o:before {
.van-icon-info-o:before {
content: "\F02D";
}
.van-icon-like:before {
.van-icon-like-o:before {
content: "\F02E";
}
.van-icon-location:before {
.van-icon-like:before {
content: "\F02F";
}
.van-icon-logistics:before {
.van-icon-location:before {
content: "\F030";
}
.van-icon-member-day-privilege:before {
.van-icon-logistics:before {
content: "\F031";
}
.van-icon-more-o:before {
.van-icon-member-day-privilege:before {
content: "\F032";
}
.van-icon-more:before {
.van-icon-more-o:before {
content: "\F033";
}
.van-icon-new-arrival:before {
.van-icon-more:before {
content: "\F034";
}
.van-icon-new:before {
.van-icon-new-arrival:before {
content: "\F035";
}
.van-icon-other-pay:before {
.van-icon-new:before {
content: "\F036";
}
.van-icon-passed:before {
.van-icon-other-pay:before {
content: "\F037";
}
.van-icon-password-not-view:before {
.van-icon-passed:before {
content: "\F038";
}
.van-icon-password-view:before {
.van-icon-password-not-view:before {
content: "\F039";
}
.van-icon-pause:before {
.van-icon-password-view:before {
content: "\F03A";
}
.van-icon-peer-pay:before {
.van-icon-pause:before {
content: "\F03B";
}
.van-icon-pending-deliver:before {
.van-icon-peer-pay:before {
content: "\F03C";
}
.van-icon-pending-evaluate:before {
.van-icon-pending-deliver:before {
content: "\F03D";
}
.van-icon-pending-orders:before {
.van-icon-pending-evaluate:before {
content: "\F03E";
}
.van-icon-pending-payment:before {
.van-icon-pending-orders:before {
content: "\F03F";
}
.van-icon-phone:before {
.van-icon-pending-payment:before {
content: "\F040";
}
.van-icon-photo:before {
.van-icon-phone:before {
content: "\F041";
}
.van-icon-photograph:before {
.van-icon-photo:before {
content: "\F042";
}
.van-icon-play:before {
.van-icon-photograph:before {
content: "\F043";
}
.van-icon-point-gift:before {
.van-icon-play:before {
content: "\F044";
}
.van-icon-points-mall:before {
.van-icon-point-gift:before {
content: "\F045";
}
.van-icon-points:before {
.van-icon-points-mall:before {
content: "\F046";
}
.van-icon-qr-invalid:before {
.van-icon-points:before {
content: "\F047";
}
.van-icon-qr:before {
.van-icon-qr-invalid:before {
content: "\F048";
}
.van-icon-question:before {
.van-icon-qr:before {
content: "\F049";
}
.van-icon-receive-gift:before {
.van-icon-question:before {
content: "\F04A";
}
.van-icon-records:before {
.van-icon-receive-gift:before {
content: "\F04B";
}
.van-icon-search:before {
.van-icon-records:before {
content: "\F04C";
}
.van-icon-send-gift:before {
.van-icon-search:before {
content: "\F04D";
}
.van-icon-setting:before {
.van-icon-send-gift:before {
content: "\F04E";
}
.van-icon-share:before {
.van-icon-setting:before {
content: "\F04F";
}
.van-icon-shop-collect:before {
.van-icon-share:before {
content: "\F050";
}
.van-icon-shop:before {
.van-icon-shop-collect:before {
content: "\F051";
}
.van-icon-shopping-cart:before {
.van-icon-shop:before {
content: "\F052";
}
.van-icon-sign:before {
.van-icon-shopping-cart:before {
content: "\F053";
}
.van-icon-stop:before {
.van-icon-sign:before {
content: "\F054";
}
.van-icon-success:before {
.van-icon-stop:before {
content: "\F055";
}
.van-icon-tosend:before {
.van-icon-success:before {
content: "\F056";
}
.van-icon-underway:before {
.van-icon-tosend:before {
content: "\F057";
}
.van-icon-upgrade:before {
.van-icon-underway:before {
content: "\F058";
}
.van-icon-value-card:before {
.van-icon-upgrade:before {
content: "\F059";
}
.van-icon-wap-home:before {
.van-icon-value-card:before {
content: "\F05A";
}
.van-icon-wap-nav:before {
.van-icon-wap-home:before {
content: "\F05B";
}
.van-icon-wechat:before {
.van-icon-wap-nav:before {
content: "\F05C";
}
.van-icon-wechat:before {
content: "\F05D";
}
Binary file not shown.