Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue

This commit is contained in:
tsxuehu
2017-04-13 16:59:46 +08:00
18 changed files with 343 additions and 89 deletions
Binary file not shown.
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@youzan/zanui-css",
"version": "0.1.0",
"version": "0.1.1",
"description": "zanui css.",
"main": "lib/index.css",
"style": "lib/index.css",
@@ -149,6 +149,16 @@ module.exports = {
src: '联系人.svg',
css: 'contact',
'correct_contour_direction': true
},
{
keywords: ['wechat'],
src: '微信支付.svg',
css: 'wechat'
},
{
keywords: ['alipay'],
src: '支付宝支付.svg',
css: 'alipay'
}
]
};
+8 -6
View File
@@ -2,11 +2,11 @@
@font-face {
font-family: 'zan-icon';
src: url('https://b.yzcdn.cn/zanui/icon/zanui-icon-55de83a2f0.eot');
src: url('https://b.yzcdn.cn/zanui/icon/zanui-icon-55de83a2f0.eot?#iefix') format('embedded-opentype'),
url('https://b.yzcdn.cn/zanui/icon/zanui-icon-55de83a2f0.woff2') format('woff2'),
url('https://b.yzcdn.cn/zanui/icon/zanui-icon-55de83a2f0.woff') format('woff'),
url('https://b.yzcdn.cn/zanui/icon/zanui-icon-55de83a2f0.ttf') format('truetype')
src: url('https://b.yzcdn.cn/zanui/icon/zanui-icon-8884a88b28.eot');
src: url('https://b.yzcdn.cn/zanui/icon/zanui-icon-8884a88b28.eot?#iefix') format('embedded-opentype'),
url('https://b.yzcdn.cn/zanui/icon/zanui-icon-8884a88b28.woff2') format('woff2'),
url('https://b.yzcdn.cn/zanui/icon/zanui-icon-8884a88b28.woff') format('woff'),
url('https://b.yzcdn.cn/zanui/icon/zanui-icon-8884a88b28.ttf') format('truetype')
}
.zan-icon {
@@ -73,4 +73,6 @@
.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-contact:before { content: '\e81a'; } /* '' */
.zan-icon-wechat:before { content: '\e81b'; } /* '' */
.zan-icon-alipay:before { content: '\e81c'; } /* '' */