diff --git a/assets/icons/icons.sketch b/assets/icons/icons.sketch index e34b742e..5b623ab1 100644 Binary files a/assets/icons/icons.sketch and b/assets/icons/icons.sketch differ diff --git a/example/pages/icon/index.js b/example/pages/icon/index.js index a8594f4d..d31d89f5 100644 --- a/example/pages/icon/index.js +++ b/example/pages/icon/index.js @@ -26,7 +26,9 @@ Page({ 'photograph', 'add', 'add2', + 'add-o', 'photo', + 'cart', 'arrow', 'search', 'clear', @@ -80,8 +82,7 @@ Page({ 'tosend', 'sign', 'home', - 'phone', - 'add-o' + 'phone' ] } }); diff --git a/example/pages/icon/index.wxml b/example/pages/icon/index.wxml index c3e69239..074c12dd 100644 --- a/example/pages/icon/index.wxml +++ b/example/pages/icon/index.wxml @@ -4,7 +4,7 @@ - + zan-icon-{{ icon }} diff --git a/example/pages/icon/index.wxss b/example/pages/icon/index.wxss index da297c69..9369da59 100644 --- a/example/pages/icon/index.wxss +++ b/example/pages/icon/index.wxss @@ -9,6 +9,6 @@ font-size: 10px; } .zan-icon { - font-size: 40px; + font-size: 24px; margin: 20px; } diff --git a/packages/icon/index.pcss b/packages/icon/index.pcss index d0978054..5b0731b5 100644 --- a/packages/icon/index.pcss +++ b/packages/icon/index.pcss @@ -2,11 +2,11 @@ @font-face { font-family: 'zanui-weapp-icon'; - src: url('https://b.yzcdn.cn/zanui-weapp/zanui-weapp-icon-fc7d099492.eot'); - src: url('https://b.yzcdn.cn/zanui-weapp/zanui-weapp-icon-fc7d099492.eot?#iefix') format('embedded-opentype'), - url('https://b.yzcdn.cn/zanui-weapp/zanui-weapp-icon-fc7d099492.woff2') format('woff2'), - url('https://b.yzcdn.cn/zanui-weapp/zanui-weapp-icon-fc7d099492.woff') format('woff'), - url('https://b.yzcdn.cn/zanui-weapp/zanui-weapp-icon-fc7d099492.ttf') format('truetype') + src: url('https://b.yzcdn.cn/zanui-weapp/zanui-weapp-icon-2e235d42a2.eot'); + src: url('https://b.yzcdn.cn/zanui-weapp/zanui-weapp-icon-2e235d42a2.eot?#iefix') format('embedded-opentype'), + url('https://b.yzcdn.cn/zanui-weapp/zanui-weapp-icon-2e235d42a2.woff2') format('woff2'), + url('https://b.yzcdn.cn/zanui-weapp/zanui-weapp-icon-2e235d42a2.woff') format('woff'), + url('https://b.yzcdn.cn/zanui-weapp/zanui-weapp-icon-2e235d42a2.ttf') format('truetype') } .zan-icon { @@ -65,65 +65,66 @@ .zan-icon-logistics:before { content: '\e810'; } /* '' */ .zan-icon-edit:before { content: '\e811'; } /* '' */ .zan-icon-passed:before { content: '\e812'; } /* '' */ -.zan-icon-shopping-cart:before { content: '\e813'; } /* '' */ -.zan-icon-arrow:before { content: '\e814'; } /* '' */ -.zan-icon-gift:before { content: '\e815'; } /* '' */ -.zan-icon-search:before { content: '\e816'; } /* '' */ -.zan-icon-clear:before { content: '\e817'; } /* '' */ -.zan-icon-success:before { content: '\e818'; } /* '' */ -.zan-icon-fail:before { content: '\e819'; } /* '' */ -.zan-icon-contact:before { content: '\e81a'; } /* '' */ -.zan-icon-wechat:before { content: '\e81b'; } /* '' */ -.zan-icon-alipay:before { content: '\e81c'; } /* '' */ -.zan-icon-password-view:before { content: '\e81d'; } /* '' */ -.zan-icon-password-not-view:before { content: '\e81e'; } /* '' */ -.zan-icon-wap-nav:before { content: '\e81f'; } /* '' */ -.zan-icon-wap-home:before { content: '\e820'; } /* '' */ -.zan-icon-ecard-pay:before { content: '\e821'; } /* '' */ -.zan-icon-balance-pay:before { content: '\e822'; } /* '' */ -.zan-icon-peer-pay:before { content: '\e823'; } /* '' */ -.zan-icon-credit-pay:before { content: '\e824'; } /* '' */ -.zan-icon-debit-pay:before { content: '\e825'; } /* '' */ -.zan-icon-other-pay:before { content: '\e826'; } /* '' */ -.zan-icon-browsing-history:before { content: '\e827'; } /* '' */ -.zan-icon-goods-collect:before { content: '\e828'; } /* '' */ -.zan-icon-shop-collect:before { content: '\e829'; } /* '' */ -.zan-icon-receive-gift:before { content: '\e82a'; } /* '' */ -.zan-icon-send-gift:before { content: '\e82b'; } /* '' */ -.zan-icon-setting:before { content: '\e82c'; } /* '' */ -.zan-icon-points:before { content: '\e82d'; } /* '' */ -.zan-icon-coupon:before { content: '\e82e'; } /* '' */ -.zan-icon-free-postage:before { content: '\e82f'; } /* '' */ -.zan-icon-discount:before { content: '\e830'; } /* '' */ -.zan-icon-birthday-privilege:before { content: '\e831'; } /* '' */ -.zan-icon-member-day-privilege:before { content: '\e832'; } /* '' */ -.zan-icon-balance-details:before { content: '\e833'; } /* '' */ -.zan-icon-cash-back-record:before { content: '\e834'; } /* '' */ -.zan-icon-points-mall:before { content: '\e835'; } /* '' */ -.zan-icon-exchange-record:before { content: '\e836'; } /* '' */ -.zan-icon-pending-payment:before { content: '\e837'; } /* '' */ -.zan-icon-pending-orders:before { content: '\e838'; } /* '' */ -.zan-icon-pending-deliver:before { content: '\e839'; } /* '' */ -.zan-icon-pending-evaluate:before { content: '\e83a'; } /* '' */ -.zan-icon-gift-card-pay:before { content: '\e83b'; } /* '' */ -.zan-icon-cash-on-deliver:before { content: '\e83c'; } /* '' */ -.zan-icon-underway:before { content: '\e83d'; } /* '' */ -.zan-icon-point-gift:before { content: '\e83e'; } /* '' */ -.zan-icon-after-sale:before { content: '\e83f'; } /* '' */ -.zan-icon-edit-data:before { content: '\e840'; } /* '' */ -.zan-icon-question:before { content: '\e841'; } /* '' */ -.zan-icon-delete:before { content: '\e842'; } /* '' */ -.zan-icon-records:before { content: '\e843'; } /* '' */ -.zan-icon-description:before { content: '\e844'; } /* '' */ -.zan-icon-card:before { content: '\e845'; } /* '' */ -.zan-icon-gift-card:before { content: '\e846'; } /* '' */ -.zan-icon-clock:before { content: '\e847'; } /* '' */ -.zan-icon-gold-coin:before { content: '\e848'; } /* '' */ -.zan-icon-completed:before { content: '\e849'; } /* '' */ -.zan-icon-value-card:before { content: '\e84a'; } /* '' */ -.zan-icon-certificate:before { content: '\e84b'; } /* '' */ -.zan-icon-tosend:before { content: '\e84c'; } /* '' */ -.zan-icon-sign:before { content: '\e84d'; } /* '' */ -.zan-icon-home:before { content: '\e84e'; } /* '' */ -.zan-icon-phone:before { content: '\e84f'; } /* '' */ -.zan-icon-add-o:before { content: '\e850'; } /* '' */ \ No newline at end of file +.zan-icon-cart:before { content: '\e813'; } /* '' */ +.zan-icon-shopping-cart:before { content: '\e814'; } /* '' */ +.zan-icon-arrow:before { content: '\e815'; } /* '' */ +.zan-icon-gift:before { content: '\e816'; } /* '' */ +.zan-icon-search:before { content: '\e817'; } /* '' */ +.zan-icon-clear:before { content: '\e818'; } /* '' */ +.zan-icon-success:before { content: '\e819'; } /* '' */ +.zan-icon-fail:before { content: '\e81a'; } /* '' */ +.zan-icon-contact:before { content: '\e81b'; } /* '' */ +.zan-icon-wechat:before { content: '\e81c'; } /* '' */ +.zan-icon-alipay:before { content: '\e81d'; } /* '' */ +.zan-icon-password-view:before { content: '\e81e'; } /* '' */ +.zan-icon-password-not-view:before { content: '\e81f'; } /* '' */ +.zan-icon-wap-nav:before { content: '\e820'; } /* '' */ +.zan-icon-wap-home:before { content: '\e821'; } /* '' */ +.zan-icon-ecard-pay:before { content: '\e822'; } /* '' */ +.zan-icon-balance-pay:before { content: '\e823'; } /* '' */ +.zan-icon-peer-pay:before { content: '\e824'; } /* '' */ +.zan-icon-credit-pay:before { content: '\e825'; } /* '' */ +.zan-icon-debit-pay:before { content: '\e826'; } /* '' */ +.zan-icon-other-pay:before { content: '\e827'; } /* '' */ +.zan-icon-browsing-history:before { content: '\e828'; } /* '' */ +.zan-icon-goods-collect:before { content: '\e829'; } /* '' */ +.zan-icon-shop-collect:before { content: '\e82a'; } /* '' */ +.zan-icon-receive-gift:before { content: '\e82b'; } /* '' */ +.zan-icon-send-gift:before { content: '\e82c'; } /* '' */ +.zan-icon-setting:before { content: '\e82d'; } /* '' */ +.zan-icon-points:before { content: '\e82e'; } /* '' */ +.zan-icon-coupon:before { content: '\e82f'; } /* '' */ +.zan-icon-free-postage:before { content: '\e830'; } /* '' */ +.zan-icon-discount:before { content: '\e831'; } /* '' */ +.zan-icon-birthday-privilege:before { content: '\e832'; } /* '' */ +.zan-icon-member-day-privilege:before { content: '\e833'; } /* '' */ +.zan-icon-balance-details:before { content: '\e834'; } /* '' */ +.zan-icon-cash-back-record:before { content: '\e835'; } /* '' */ +.zan-icon-points-mall:before { content: '\e836'; } /* '' */ +.zan-icon-exchange-record:before { content: '\e837'; } /* '' */ +.zan-icon-pending-payment:before { content: '\e838'; } /* '' */ +.zan-icon-pending-orders:before { content: '\e839'; } /* '' */ +.zan-icon-pending-deliver:before { content: '\e83a'; } /* '' */ +.zan-icon-pending-evaluate:before { content: '\e83b'; } /* '' */ +.zan-icon-gift-card-pay:before { content: '\e83c'; } /* '' */ +.zan-icon-cash-on-deliver:before { content: '\e83d'; } /* '' */ +.zan-icon-underway:before { content: '\e83e'; } /* '' */ +.zan-icon-point-gift:before { content: '\e83f'; } /* '' */ +.zan-icon-after-sale:before { content: '\e840'; } /* '' */ +.zan-icon-edit-data:before { content: '\e841'; } /* '' */ +.zan-icon-question:before { content: '\e842'; } /* '' */ +.zan-icon-delete:before { content: '\e843'; } /* '' */ +.zan-icon-records:before { content: '\e844'; } /* '' */ +.zan-icon-description:before { content: '\e845'; } /* '' */ +.zan-icon-card:before { content: '\e846'; } /* '' */ +.zan-icon-gift-card:before { content: '\e847'; } /* '' */ +.zan-icon-clock:before { content: '\e848'; } /* '' */ +.zan-icon-gold-coin:before { content: '\e849'; } /* '' */ +.zan-icon-completed:before { content: '\e84a'; } /* '' */ +.zan-icon-value-card:before { content: '\e84b'; } /* '' */ +.zan-icon-certificate:before { content: '\e84c'; } /* '' */ +.zan-icon-tosend:before { content: '\e84d'; } /* '' */ +.zan-icon-sign:before { content: '\e84e'; } /* '' */ +.zan-icon-home:before { content: '\e84f'; } /* '' */ +.zan-icon-phone:before { content: '\e850'; } /* '' */ +.zan-icon-add-o:before { content: '\e851'; } /* '' */ \ No newline at end of file diff --git a/scripts/icons/fount-config.js b/scripts/icons/fount-config.js index bc93f0d0..ee8e608d 100644 --- a/scripts/icons/fount-config.js +++ b/scripts/icons/fount-config.js @@ -112,8 +112,13 @@ module.exports = { css: 'passed' }, { - keywords: ['shopping-cart'], + keywords: ['cart'], src: '购物车2.svg', + css: 'cart' + }, + { + keywords: ['shopping-cart'], + src: '购物车1.svg', css: 'shopping-cart' }, {