diff --git a/docs/examples-dist/icon.vue b/docs/examples-dist/icon.vue index ed8d981e1..932b5155c 100644 --- a/docs/examples-dist/icon.vue +++ b/docs/examples-dist/icon.vue @@ -1,21 +1,33 @@ + \ No newline at end of file diff --git a/docs/examples-docs/icon.md b/docs/examples-docs/icon.md index cc1d18579..8c9b012a7 100644 --- a/docs/examples-docs/icon.md +++ b/docs/examples-docs/icon.md @@ -16,23 +16,35 @@ :::demo 所有Icon ```html - - - - + + + + + + + - + + + + + + + + + + + + + + + + + + + - - - - - - - - - ``` ::: diff --git a/docs/examples-docs/swipe.md b/docs/examples-docs/swipe.md index 87baa7473..e5761444a 100644 --- a/docs/examples-docs/swipe.md +++ b/docs/examples-docs/swipe.md @@ -3,6 +3,10 @@ @b swipe { .zan-swipe { height: 200px; + + img { + width: 100%; + } } } } @@ -24,3 +28,18 @@ ``` ::: + +### 自动轮播 + +:::demo 自动轮播 +```html + + + + + + + + +``` +::: diff --git a/packages/swipe/src/scroll.js b/packages/swipe/src/scroll.js index 7a8be2bb8..c2b2477ac 100755 --- a/packages/swipe/src/scroll.js +++ b/packages/swipe/src/scroll.js @@ -34,7 +34,7 @@ extend(Scroll.prototype, { update: function() { const oldPages = this.pages - this.pages = this.wrapElem.querySelectorAll('.swp-page'); + this.pages = this.wrapElem.querySelectorAll('.zan-swipe-item'); if (oldPages && oldPages.length === this.pages.length) { const isSame = Array.prototype.every.call(this.pages, (elem, index) => { return this.pages[index] === oldPages[index] @@ -50,7 +50,8 @@ extend(Scroll.prototype, { width: '100%', height: '100%', display: 'block', - '-webkit-transform': 'translate3d(-9999px, 0, 0)' + '-webkit-transform': 'translate3d(-9999px, 0, 0)', + 'pointer-events': 'none' }; setElementsStyles(this.pages, defaultStyle); this.mCache = { diff --git a/packages/zanui-css/assets/icons.sketch b/packages/zanui-css/assets/icons.sketch new file mode 100644 index 000000000..5ed6b75ed Binary files /dev/null and b/packages/zanui-css/assets/icons.sketch differ diff --git a/packages/zanui-css/build/LICENSE.txt b/packages/zanui-css/build/LICENSE.txt new file mode 100644 index 000000000..52e9592f0 --- /dev/null +++ b/packages/zanui-css/build/LICENSE.txt @@ -0,0 +1,12 @@ +Font license info + + +## zanui-icon + + Copyright (C) 2017 by original authors + + Author: houzi, zhangmin + License: MIT (https://opensource.org/licenses/MIT) + Homepage: http://github.com/youzan + + diff --git a/packages/zanui-css/build/README.txt b/packages/zanui-css/build/README.txt new file mode 100644 index 000000000..f1bb5f708 --- /dev/null +++ b/packages/zanui-css/build/README.txt @@ -0,0 +1,59 @@ +This webfont is generated by iconfount. + + +================================================================================ +Please, note, that you should obey original font licenses, used to make this +webfont pack. Details available in LICENSE.txt file. + +- Usually, it's enough to publish content of LICENSE.txt file somewhere on your + site in "About" section. + +- If your project is open-source, usually, it will be ok to make LICENSE.txt + file publicly available in your repository. + +- Fonts, used in iconfount, don't require a clickable link on your site. + But any kind of additional authors crediting is welcome. +================================================================================ + + +Comments on output content +--------------------------- + +- /font/* - fonts in different formats + +- /css/* - different kinds of css, for all situations. Should be ok with + twitter bootstrap. Also, you can skip style and assign icon classes + directly to text elements, if you don't mind about IE7. + +- demo.html - demo file, to show your webfont content + +- LICENSE.txt - license info about source fonts, used to build your one. + +- config.json - for debugging only + + +Why so many CSS files ? +----------------------- + +Because we like to fit all your needs :) + +- basic file, .css - is usually enough, it contains @font-face + and character code definitions + +- *-ie7.css - if you need IE7 support, but still don't wish to put char codes + directly into html + +- *-codes.css and *-ie7-codes.css - if you like to use your own @font-face + rules, but still wish to benefit from css generation. That can be very + convenient for automated asset build systems. When you need to update font - + no need to manually edit files, just override old version with archive + content. + +- *-embedded.css - basic css file, but with embedded WOFF font, to avoid + CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain. + We strongly recommend to resolve this issue by `Access-Control-Allow-Origin` + server headers. But if you ok with dirty hack - this file is for you. Note, + that data url moved to separate @font-face to avoid problems with + + + + + + + + +
+

+ zanui-icon + font demo +

+ +
+
+
+
zan-icon-qr-invalid0xe800
+
zan-icon-qr0xe801
+
zan-icon-pay-fail0xe802
+
zan-icon-exchange0xe803
+
+
+
zan-icon-close0xe804
+
zan-icon-location0xe805
+
zan-icon-upgrade0xe806
+
zan-icon-check0xe807
+
+
+
zan-icon-checked0xe808
+
zan-icon-like-o0xe809
+
zan-icon-like0xe80a
+
zan-icon-chat0xe80b
+
+
+
zan-icon-paid0xe80c
+
zan-icon-delivered0xe80d
+
zan-icon-finished0xe80e
+
zan-icon-shop0xe80f
+
+
+
zan-icon-deliver0xe810
+
zan-icon-success0xe811
+
zan-icon-photograph0xe812
+
zan-icon-add0xe813
+
+
+
zan-icon-not-payed0xe814
+
zan-icon-add20xe815
+
zan-icon-photo0xe816
+
zan-icon-logistics0xe817
+
+
+
zan-icon-edit0xe818
+
zan-icon-passed0xe819
+
zan-icon-cart0xe81a
+
zan-icon-arrow0xe81b
+
+
+
zan-icon-gift0xe81c
+
+
+
+ This demo page requires IE >= 8, but the icons should work on IE 6 and 7. +
+ Generated by iconfount +
+ + \ No newline at end of file diff --git a/packages/zanui-css/build/font/zanui-icon-3f61f62c01.eot b/packages/zanui-css/build/font/zanui-icon-3f61f62c01.eot new file mode 100644 index 000000000..b25f9212e Binary files /dev/null and b/packages/zanui-css/build/font/zanui-icon-3f61f62c01.eot differ diff --git a/packages/zanui-css/build/font/zanui-icon-3f61f62c01.svg b/packages/zanui-css/build/font/zanui-icon-3f61f62c01.svg new file mode 100644 index 000000000..13b252183 --- /dev/null +++ b/packages/zanui-css/build/font/zanui-icon-3f61f62c01.svg @@ -0,0 +1,68 @@ + + + +Copyright (C) 2017 by original authors + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/zanui-css/build/font/zanui-icon-3f61f62c01.ttf b/packages/zanui-css/build/font/zanui-icon-3f61f62c01.ttf new file mode 100644 index 000000000..f01857c12 Binary files /dev/null and b/packages/zanui-css/build/font/zanui-icon-3f61f62c01.ttf differ diff --git a/packages/zanui-css/build/font/zanui-icon-3f61f62c01.woff b/packages/zanui-css/build/font/zanui-icon-3f61f62c01.woff new file mode 100644 index 000000000..13c33ca85 Binary files /dev/null and b/packages/zanui-css/build/font/zanui-icon-3f61f62c01.woff differ diff --git a/packages/zanui-css/build/font/zanui-icon-3f61f62c01.woff2 b/packages/zanui-css/build/font/zanui-icon-3f61f62c01.woff2 new file mode 100644 index 000000000..cfd78f3a8 Binary files /dev/null and b/packages/zanui-css/build/font/zanui-icon-3f61f62c01.woff2 differ diff --git a/packages/zanui-css/icons/Rectangle 244.svg b/packages/zanui-css/icons/Rectangle 244.svg new file mode 100644 index 000000000..2e15110af --- /dev/null +++ b/packages/zanui-css/icons/Rectangle 244.svg @@ -0,0 +1,14 @@ + + + + Rectangle 244 + Created with sketchtool. + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/messgae.svg b/packages/zanui-css/icons/messgae.svg new file mode 100644 index 000000000..fee56413e --- /dev/null +++ b/packages/zanui-css/icons/messgae.svg @@ -0,0 +1,17 @@ + + + + messgae + Created with sketchtool. + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/不可选.svg b/packages/zanui-css/icons/不可选.svg new file mode 100644 index 000000000..0cd325326 --- /dev/null +++ b/packages/zanui-css/icons/不可选.svg @@ -0,0 +1,13 @@ + + + + 不可选 + Created with sketchtool. + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/二维码.svg b/packages/zanui-css/icons/二维码.svg new file mode 100644 index 000000000..f8ab16f19 --- /dev/null +++ b/packages/zanui-css/icons/二维码.svg @@ -0,0 +1,19 @@ + + + + 二维码 + Created with sketchtool. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/二维码失效.svg b/packages/zanui-css/icons/二维码失效.svg new file mode 100644 index 000000000..25cca2f4c --- /dev/null +++ b/packages/zanui-css/icons/二维码失效.svg @@ -0,0 +1,19 @@ + + + + 二维码失效 + Created with sketchtool. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/交易失败.svg b/packages/zanui-css/icons/交易失败.svg new file mode 100644 index 000000000..2dc739bca --- /dev/null +++ b/packages/zanui-css/icons/交易失败.svg @@ -0,0 +1,27 @@ + + + + 交易失败 + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/兑换.svg b/packages/zanui-css/icons/兑换.svg new file mode 100644 index 000000000..47aa431bc --- /dev/null +++ b/packages/zanui-css/icons/兑换.svg @@ -0,0 +1,17 @@ + + + + 兑换 + Created with sketchtool. + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/关闭.svg b/packages/zanui-css/icons/关闭.svg new file mode 100644 index 000000000..99e674fd5 --- /dev/null +++ b/packages/zanui-css/icons/关闭.svg @@ -0,0 +1,16 @@ + + + + 关闭 + Created with sketchtool. + + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/其他分店.svg b/packages/zanui-css/icons/其他分店.svg new file mode 100644 index 000000000..e16476be5 --- /dev/null +++ b/packages/zanui-css/icons/其他分店.svg @@ -0,0 +1,14 @@ + + + + 其他分店 + Created with sketchtool. + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/升级地址.svg b/packages/zanui-css/icons/升级地址.svg new file mode 100644 index 000000000..cdff148ad --- /dev/null +++ b/packages/zanui-css/icons/升级地址.svg @@ -0,0 +1,14 @@ + + + + 升级地址 + Created with sketchtool. + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/单选.svg b/packages/zanui-css/icons/单选.svg new file mode 100644 index 000000000..99ac3b516 --- /dev/null +++ b/packages/zanui-css/icons/单选.svg @@ -0,0 +1,13 @@ + + + + 单选 + Created with sketchtool. + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/喜欢.svg b/packages/zanui-css/icons/喜欢.svg new file mode 100644 index 000000000..48c0c6cc2 --- /dev/null +++ b/packages/zanui-css/icons/喜欢.svg @@ -0,0 +1,10 @@ + + + + 喜欢 + Created with sketchtool. + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/喜欢2.svg b/packages/zanui-css/icons/喜欢2.svg new file mode 100644 index 000000000..fd3932a70 --- /dev/null +++ b/packages/zanui-css/icons/喜欢2.svg @@ -0,0 +1,10 @@ + + + + 喜欢2 + Created with sketchtool. + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/复选.svg b/packages/zanui-css/icons/复选.svg new file mode 100644 index 000000000..ddcd916e0 --- /dev/null +++ b/packages/zanui-css/icons/复选.svg @@ -0,0 +1,13 @@ + + + + 复选 + Created with sketchtool. + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/复选不改.svg b/packages/zanui-css/icons/复选不改.svg new file mode 100644 index 000000000..a9f76a8d0 --- /dev/null +++ b/packages/zanui-css/icons/复选不改.svg @@ -0,0 +1,13 @@ + + + + 复选不改 + Created with sketchtool. + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/客服.svg b/packages/zanui-css/icons/客服.svg new file mode 100644 index 000000000..e45342310 --- /dev/null +++ b/packages/zanui-css/icons/客服.svg @@ -0,0 +1,18 @@ + + + + 客服 + Created with sketchtool. + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/已付款.svg b/packages/zanui-css/icons/已付款.svg new file mode 100644 index 000000000..1d39a8ac2 --- /dev/null +++ b/packages/zanui-css/icons/已付款.svg @@ -0,0 +1,26 @@ + + + + 已付款 + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/已发货.svg b/packages/zanui-css/icons/已发货.svg new file mode 100644 index 000000000..50ebb34c4 --- /dev/null +++ b/packages/zanui-css/icons/已发货.svg @@ -0,0 +1,30 @@ + + + + 已发货 + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/已完成.svg b/packages/zanui-css/icons/已完成.svg new file mode 100644 index 000000000..e32084317 --- /dev/null +++ b/packages/zanui-css/icons/已完成.svg @@ -0,0 +1,26 @@ + + + + 已完成 + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/店铺.svg b/packages/zanui-css/icons/店铺.svg new file mode 100644 index 000000000..1704af0ad --- /dev/null +++ b/packages/zanui-css/icons/店铺.svg @@ -0,0 +1,15 @@ + + + + 店铺 + Created with sketchtool. + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/待发货.svg b/packages/zanui-css/icons/待发货.svg new file mode 100644 index 000000000..2b1679eb5 --- /dev/null +++ b/packages/zanui-css/icons/待发货.svg @@ -0,0 +1,28 @@ + + + + 待发货 + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/成功开团.svg b/packages/zanui-css/icons/成功开团.svg new file mode 100644 index 000000000..5ab3d2687 --- /dev/null +++ b/packages/zanui-css/icons/成功开团.svg @@ -0,0 +1,14 @@ + + + + 成功开团 + Created with sketchtool. + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/拍照.svg b/packages/zanui-css/icons/拍照.svg new file mode 100644 index 000000000..6723e2dde --- /dev/null +++ b/packages/zanui-css/icons/拍照.svg @@ -0,0 +1,10 @@ + + + + 拍照 + Created with sketchtool. + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/新增地址.svg b/packages/zanui-css/icons/新增地址.svg new file mode 100644 index 000000000..ed0352c96 --- /dev/null +++ b/packages/zanui-css/icons/新增地址.svg @@ -0,0 +1,13 @@ + + + + 新增地址 + Created with sketchtool. + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/未付款.svg b/packages/zanui-css/icons/未付款.svg new file mode 100644 index 000000000..5c374eb81 --- /dev/null +++ b/packages/zanui-css/icons/未付款.svg @@ -0,0 +1,26 @@ + + + + 未付款 + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/添加.svg b/packages/zanui-css/icons/添加.svg new file mode 100644 index 000000000..0de302655 --- /dev/null +++ b/packages/zanui-css/icons/添加.svg @@ -0,0 +1,10 @@ + + + + 添加 + Created with sketchtool. + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/照片.svg b/packages/zanui-css/icons/照片.svg new file mode 100644 index 000000000..7cfc5a345 --- /dev/null +++ b/packages/zanui-css/icons/照片.svg @@ -0,0 +1,10 @@ + + + + 照片 + Created with sketchtool. + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/物流.svg b/packages/zanui-css/icons/物流.svg new file mode 100644 index 000000000..cb102167b --- /dev/null +++ b/packages/zanui-css/icons/物流.svg @@ -0,0 +1,21 @@ + + + + 物流 + Created with sketchtool. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/编辑地址.svg b/packages/zanui-css/icons/编辑地址.svg new file mode 100644 index 000000000..d69c39e3b --- /dev/null +++ b/packages/zanui-css/icons/编辑地址.svg @@ -0,0 +1,14 @@ + + + + 编辑地址 + Created with sketchtool. + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/认证通过.svg b/packages/zanui-css/icons/认证通过.svg new file mode 100644 index 000000000..1784b3aa2 --- /dev/null +++ b/packages/zanui-css/icons/认证通过.svg @@ -0,0 +1,14 @@ + + + + 认证通过 + Created with sketchtool. + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/购物车.svg b/packages/zanui-css/icons/购物车.svg new file mode 100644 index 000000000..18cfdea8a --- /dev/null +++ b/packages/zanui-css/icons/购物车.svg @@ -0,0 +1,17 @@ + + + + 购物车 + Created with sketchtool. + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/进入箭头.svg b/packages/zanui-css/icons/进入箭头.svg new file mode 100644 index 000000000..42dd7af2a --- /dev/null +++ b/packages/zanui-css/icons/进入箭头.svg @@ -0,0 +1,10 @@ + + + + 进入箭头 + Created with sketchtool. + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/进度.svg b/packages/zanui-css/icons/进度.svg new file mode 100644 index 000000000..4824b2706 --- /dev/null +++ b/packages/zanui-css/icons/进度.svg @@ -0,0 +1,10 @@ + + + + 进度 + Created with sketchtool. + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/送礼.svg b/packages/zanui-css/icons/送礼.svg new file mode 100644 index 000000000..1691528b5 --- /dev/null +++ b/packages/zanui-css/icons/送礼.svg @@ -0,0 +1,19 @@ + + + + 送礼 + Created with sketchtool. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/选中.svg b/packages/zanui-css/icons/选中.svg new file mode 100644 index 000000000..4a54c4b63 --- /dev/null +++ b/packages/zanui-css/icons/选中.svg @@ -0,0 +1,12 @@ + + + + 选中 + Created with sketchtool. + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/选中2.svg b/packages/zanui-css/icons/选中2.svg new file mode 100644 index 000000000..829cda160 --- /dev/null +++ b/packages/zanui-css/icons/选中2.svg @@ -0,0 +1,12 @@ + + + + 选中2 + Created with sketchtool. + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/选中不改.svg b/packages/zanui-css/icons/选中不改.svg new file mode 100644 index 000000000..a55bbaaba --- /dev/null +++ b/packages/zanui-css/icons/选中不改.svg @@ -0,0 +1,12 @@ + + + + 选中不改 + Created with sketchtool. + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/选中不改2.svg b/packages/zanui-css/icons/选中不改2.svg new file mode 100644 index 000000000..2a6237a5a --- /dev/null +++ b/packages/zanui-css/icons/选中不改2.svg @@ -0,0 +1,12 @@ + + + + 选中不改2 + Created with sketchtool. + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/选择商品开团.svg b/packages/zanui-css/icons/选择商品开团.svg new file mode 100644 index 000000000..8881e849c --- /dev/null +++ b/packages/zanui-css/icons/选择商品开团.svg @@ -0,0 +1,15 @@ + + + + 选择商品开团 + Created with sketchtool. + + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/icons/邀请好友参团.svg b/packages/zanui-css/icons/邀请好友参团.svg new file mode 100644 index 000000000..2124d2650 --- /dev/null +++ b/packages/zanui-css/icons/邀请好友参团.svg @@ -0,0 +1,14 @@ + + + + 邀请好友参团 + Created with sketchtool. + + + + + + + + + \ No newline at end of file diff --git a/packages/zanui-css/scripts/build.sh b/packages/zanui-css/scripts/build.sh new file mode 100644 index 000000000..d2aa91528 --- /dev/null +++ b/packages/zanui-css/scripts/build.sh @@ -0,0 +1,83 @@ +#!/bin/bash + +basepath=$(dirname $0) +server_prefix=/zanui/icon + +# convert relative path to absolute path +function abspath() { + pushd . > /dev/null; if [ -d "$1" ]; then cd "$1"; dirs -l +0; else cd "`dirname \"$1\"`"; cur_dir=`dirs -l +0`; if [ "$cur_dir" == "/" ]; then echo "$cur_dir`basename \"$1\"`"; else echo "$cur_dir/`basename \"$1\"`"; fi; fi; popd > /dev/null; +} + +command_exists () { + type "$1" >/dev/null 2>&1 +} + +fontname() { + if command_exists superman ; then + echo "//b.yzcdn.cn$server_prefix/$(basename $basepath/../build/font/zanui-icon-*.$1)" + else + echo "$(abspath $basepath/../build/font/zanui-icon-*.$1)" + fi +} + +# generate font files from sketch file +$basepath/extract-icons.sh +$basepath/generate-font.sh + +if command_exists superman ; then + # upload to cdn + superman cdn $server_prefix $basepath/../build/font/zanui-icon-* +fi + +# generate fontface style +eot=$(fontname eot) +cat > $basepath/../src/icon.css <> $basepath/../src/icon.css diff --git a/packages/zanui-css/scripts/extract-icons.sh b/packages/zanui-css/scripts/extract-icons.sh new file mode 100755 index 000000000..b3c54e476 --- /dev/null +++ b/packages/zanui-css/scripts/extract-icons.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +basepath=$(dirname $0) + +rm -rf $basepath/../icons +sketchtool export slices --formats=svg --overwriting=YES --save-for-web=YES --output=$basepath/../icons $basepath/../assets/icons.sketch diff --git a/packages/zanui-css/scripts/fount-config.js b/packages/zanui-css/scripts/fount-config.js new file mode 100644 index 000000000..730c8647b --- /dev/null +++ b/packages/zanui-css/scripts/fount-config.js @@ -0,0 +1,162 @@ +module.exports = { + name: 'zanui-icon', + output: '../build', + meta: { + author: 'houzi, zhangmin', + license: 'MIT', + license_url: 'https://opensource.org/licenses/MIT', + homepage: 'http://github.com/youzan', + css_prefix_text: 'zan-icon-', + filename_hash: true + }, + hinting: true, + glyphs_dir: '../icons', + glyphs: [ + { + keywords: ['qr', 'invalid'], + src: '二维码失效.svg', + css: 'qr-invalid' + }, + { + keywords: ['qr'], + src: '二维码.svg', + css: 'qr' + }, + { + keywords: ['pay', 'fail'], + src: '交易失败.svg', + css: 'pay-fail' + }, + { + keywords: ['exchange'], + src: '兑换.svg', + css: 'exchange', + 'correct_contour_direction': true + }, + { + keywords: ['close'], + src: '关闭.svg', + css: 'close' + }, + { + keywords: ['location'], + src: '其他分店.svg', + css: 'location' + }, + { + keywords: ['upgrade'], + src: '升级地址.svg', + css: 'upgrade' + }, + { + keywords: ['check'], + src: '单选.svg', + css: 'check' + }, + { + keywords: ['checked'], + src: '选中.svg', + css: 'checked' + }, + { + keywords: ['like', 'outline'], + src: '喜欢.svg', + css: 'like-o' + }, + { + keywords: ['like', 'filled'], + src: '喜欢.svg', + css: 'like' + }, + { + keywords: ['chat'], + src: '客服.svg', + css: 'chat' + }, + { + keywords: ['account', 'paid'], + src: '已付款.svg', + css: 'paid' + }, + { + keywords: ['delivered'], + src: '已发货.svg', + css: 'delivered' + }, + { + keywords: ['finished'], + src: '已完成.svg', + css: 'finished' + }, + { + keywords: ['shop'], + src: '店铺.svg', + css: 'shop' + }, + { + keywords: ['deliver'], + src: '待发货.svg', + css: 'deliver' + }, + { + keywords: ['success'], + src: '成功开团.svg', + css: 'success' + }, + { + keywords: ['photograph'], + src: '拍照.svg', + css: 'photograph' + }, + { + keywords: ['add'], + src: '新增地址.svg', + css: 'add' + }, + { + keywords: ['not', 'payed'], + src: '未付款.svg', + css: 'not-payed' + }, + { + keywords: ['add2'], + src: '添加.svg', + css: 'add2' + }, + { + keywords: ['photo'], + src: '照片.svg', + css: 'photo' + }, + { + keywords: ['logistics'], + src: '物流.svg', + css: 'logistics' + }, + { + keywords: ['edit'], + src: '编辑地址.svg', + css: 'edit' + }, + { + keywords: ['passed'], + src: '认证通过.svg', + css: 'passed' + }, + { + keywords: ['cart'], + src: '购物车.svg', + css: 'cart' + }, + { + keywords: ['arrow'], + src: '进入箭头.svg', + css: 'arrow' + }, + { + keywords: ['gift'], + src: '送礼.svg', + css: 'gift' + } + ] +}; diff --git a/packages/zanui-css/scripts/generate-font.sh b/packages/zanui-css/scripts/generate-font.sh new file mode 100755 index 000000000..bd1421ec0 --- /dev/null +++ b/packages/zanui-css/scripts/generate-font.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +basepath=$(dirname $0) + +iconfount --config $basepath/fount-config.js diff --git a/packages/zanui-css/src/icon.css b/packages/zanui-css/src/icon.css index 7847d21f5..9f89f2da7 100644 --- a/packages/zanui-css/src/icon.css +++ b/packages/zanui-css/src/icon.css @@ -1,19 +1,19 @@ /* DO NOT EDIT! Generated by fount */ @font-face { - font-family: 'zuiicon'; - src: url('https://b.yzcdn.cn/zui/font/zuiicon-b37948cf5d.eot'); - src: url('https://b.yzcdn.cn/zui/font/zuiicon-b37948cf5d.eot?#iefix') format('embedded-opentype'), - url('https://b.yzcdn.cn/zui/font/zuiicon-b37948cf5d.woff2') format('woff2'), - url('https://b.yzcdn.cn/zui/font/zuiicon-b37948cf5d.woff') format('woff'), - url('https://b.yzcdn.cn/zui/font/zuiicon-b37948cf5d.ttf') format('truetype') + font-family: 'zan-icon'; + src: url('//b.yzcdn.cn/zanui/icon/zanui-icon-3f61f62c01.eot'); + src: url('//b.yzcdn.cn/zanui/icon/zanui-icon-3f61f62c01.eot?#iefix') format('embedded-opentype'), + url('//b.yzcdn.cn/zanui/icon/zanui-icon-3f61f62c01.woff2') format('woff2'), + url('//b.yzcdn.cn/zanui/icon/zanui-icon-3f61f62c01.woff') format('woff'), + url('//b.yzcdn.cn/zanui/icon/zanui-icon-3f61f62c01.ttf') format('truetype') } .zan-icon { display: inline-block; } .zan-icon::before { - font-family: "zuiicon" !important; + font-family: "zan-icon" !important; font-style: normal; font-weight: normal; speak: none; @@ -39,28 +39,40 @@ /* Font smoothing. That was taken from TWBS */ -webkit-font-smoothing: antialiased; - -mozan-osx-font-smoothing: grayscale; + -moz-osx-font-smoothing: grayscale; /* Uncomment for 3D effect */ /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ } -/* DO NOT EDIT! Generated by fount */ +/* DO NOT EDIT! Generated by iconfount */ -.zan-icon-album:before { content: '\e800'; } /* '' */ -.zan-icon-arrow:before { content: '\e801'; } /* '' */ -.zan-icon-camera:before { content: '\e802'; } /* '' */ -.zan-icon-certificate:before { content: '\e803'; } /* '' */ -.zan-icon-check:before { content: '\e804'; } /* '' */ -.zan-icon-checked:before { content: '\e805'; } /* '' */ -.zan-icon-close:before { content: '\e806'; } /* '' */ -.zan-icon-gift:before { content: '\e807'; } /* '' */ -.zan-icon-home:before { content: '\e808'; } /* '' */ -.zan-icon-location:before { content: '\e809'; } /* '' */ -.zan-icon-message:before { content: '\e80a'; } /* '' */ -.zan-icon-send:before { content: '\e80b'; } /* '' */ -.zan-icon-shopping-cart:before { content: '\e80c'; } /* '' */ -.zan-icon-sign:before { content: '\e80d'; } /* '' */ -.zan-icon-store:before { content: '\e80e'; } /* '' */ -.zan-icon-topay:before { content: '\e80f'; } /* '' */ -.zan-icon-tosend:before { content: '\e810'; } /* '' */ +.zan-icon-qr-invalid:before { content: '\e800'; } /* '' */ +.zan-icon-qr:before { content: '\e801'; } /* '' */ +.zan-icon-pay-fail:before { content: '\e802'; } /* '' */ +.zan-icon-exchange:before { content: '\e803'; } /* '' */ +.zan-icon-close:before { content: '\e804'; } /* '' */ +.zan-icon-location:before { content: '\e805'; } /* '' */ +.zan-icon-upgrade:before { content: '\e806'; } /* '' */ +.zan-icon-check:before { content: '\e807'; } /* '' */ +.zan-icon-checked:before { content: '\e808'; } /* '' */ +.zan-icon-like-o:before { content: '\e809'; } /* '' */ +.zan-icon-like:before { content: '\e80a'; } /* '' */ +.zan-icon-chat:before { content: '\e80b'; } /* '' */ +.zan-icon-paid:before { content: '\e80c'; } /* '' */ +.zan-icon-delivered:before { content: '\e80d'; } /* '' */ +.zan-icon-finished:before { content: '\e80e'; } /* '' */ +.zan-icon-shop:before { content: '\e80f'; } /* '' */ +.zan-icon-deliver:before { content: '\e810'; } /* '' */ +.zan-icon-success:before { content: '\e811'; } /* '' */ +.zan-icon-photograph:before { content: '\e812'; } /* '' */ +.zan-icon-add:before { content: '\e813'; } /* '' */ +.zan-icon-not-payed:before { content: '\e814'; } /* '' */ +.zan-icon-add2:before { content: '\e815'; } /* '' */ +.zan-icon-photo:before { content: '\e816'; } /* '' */ +.zan-icon-logistics:before { content: '\e817'; } /* '' */ +.zan-icon-edit:before { content: '\e818'; } /* '' */ +.zan-icon-passed:before { content: '\e819'; } /* '' */ +.zan-icon-cart:before { content: '\e81a'; } /* '' */ +.zan-icon-arrow:before { content: '\e81b'; } /* '' */ +.zan-icon-gift:before { content: '\e81c'; } /* '' */ \ No newline at end of file diff --git a/packages/zanui-css/src/swipe.css b/packages/zanui-css/src/swipe.css index 16a4debfc..e5af9411f 100644 --- a/packages/zanui-css/src/swipe.css +++ b/packages/zanui-css/src/swipe.css @@ -13,8 +13,8 @@ text-align: center; img { - max-width: 100%; - max-height: 100%; + width: 100%; + height: auto; } &:first-child {