Skip to content

Commit

Permalink
[Improvement] Icon: add info-o icon (#648)
Browse files Browse the repository at this point in the history
* [bugfix] Swipe: use translate2d to aviod iOS11 crash bug

* [bugfix] Area: should valid data before get area list

* [bugfix] AddressEdit: setAreaCode now work

* fix: test cases

* [Improvement] NavBar: add zIndex prop

* fix: code style

* [Improvement] Cell: adjust right padding of arrow

* [bugfix] Picker: change event not triggered when click option

* [Improvement] Dialog: add setDefaultOptions method

* [Improvement] Toast: add setDefaultOptions method

* [Doc] fix misspelling of NumberKeyboard

* [Improvement] Picker: add props to custom button text

* [bugfix] Picker: misspelling of visibleItemCount

* [Improvement] Sku: remove unnecessary codes

* update dependencies

* fix: yarn.lock

* [Improvement] CouponList: add exchangeMinLength prop

* [bugfix] Area: should not display city & county list when not select province

* [Improvement] Icon: update share icon

* [Improvement] Button: add text prop

* [Improvement] update dependencies

* [Improvement] CouponList: support v-model & exchangeButtonLoading

* [bugfix] Toast: work break

* [bugfix] Tab: active not work

* [Improvement] AddressEdit: add default slot

* [new feature] Uploader: support maxSize prop

* [bugfix] Field: multi line label stye error

* [Improvement] Sku: add getSkuData method

* [new feature] Toast: support multiple instance

* fix: reset toast message

* fix: toast message

* [Improvement] Area: add item-height & visible-item-count props

* [new feature] Dialog: support component call

* [Improvement] Toast: adjust background color

* [Improvement] Tab: add title slot

* [bugfix] TreeSelect: arrow position error

* [bugfix] Picker: style error in some andriod devices

* [new feature] Popup: support getContaienr

* [Improvement] add van-ellipsis class

* [new feature] Loading: add circular type

* fix: loading demo

* fix: loading test cases

* [new feature] Picker: add loading prop

* Merge

* [Improvement] Loading: add size prop

* fix: loading test cases

* [Improvement] Button: change loading icon

* [Improvement] Loading:  change default type to circular

* [Improvement] Circle: optimzie linecap

* [Improvement] PullRefresh: add refersh event

* [Doc] optimzie demo display

* [Doc] add build-in style document

* [bugfix] Stepper: change event error when clear input

* [Improvement] Checkbox: remove unnecessary DOM

* fix: checkbox test cases

* [Doc] simplify build process

* simplify test config

* [Doc] optimzie router & remove unused code

* [bugfix] Button loading horizontal align

* [Improvement] Popup: add click-overlay event

* [Improvement] Icon: add info-o icon
  • Loading branch information
chenjiahan committed Feb 26, 2018
1 parent 5d25d7a commit 0132e85
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 56 deletions.
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.

0 comments on commit 0132e85

Please sign in to comment.