diff --git a/packages/icon/assets/icons.sketch b/packages/icon/assets/icons.sketch index 968210474..6f25b6107 100644 Binary files a/packages/icon/assets/icons.sketch and b/packages/icon/assets/icons.sketch differ diff --git a/packages/icon/demo/index.vue b/packages/icon/demo/index.vue index 647ae8951..4f69fa35e 100644 --- a/packages/icon/demo/index.vue +++ b/packages/icon/demo/index.vue @@ -1,47 +1,40 @@ @@ -63,16 +56,12 @@ export default { }, data() { + this.basic = icons.basic.map(icon => icon.css); + this.outline = icons.outline.map(icon => icon.css); + this.filled = icons.filled.map(icon => icon.css); return { tab: 0 }; - }, - - computed: { - list() { - const key = ['basic', 'outline', 'filled'][this.tab]; - return icons[key].map(icon => icon.css); - } } }; @@ -90,21 +79,21 @@ export default { .van-col { float: none; text-align: center; - height: 50px; + height: 100px; display: inline-block; vertical-align: middle; } - .demo-col-with-text { - height: 100px; - } - .van-icon { font-size: 32px; margin: 15px 0; color: rgba(69, 90, 100, 0.8); } + .van-tab__pane { + padding-top: 10px; + } + span { display: block; font-size: 14px; diff --git a/packages/icon/index.less b/packages/icon/index.less index 5a7012bda..ac147ec7e 100644 --- a/packages/icon/index.less +++ b/packages/icon/index.less @@ -4,7 +4,7 @@ font-style: normal; font-weight: normal; font-family: 'vant-icon'; - src: url('https://img.yzcdn.cn/vant/vant-icon-7a2fab.ttf') format('truetype'); + src: url('https://img.yzcdn.cn/vant/vant-icon-874007.ttf') format('truetype'); } .van-icon { @@ -434,27 +434,3 @@ .van-icon-wechat::before { content: "\F063"; } - -.van-icon-圆角-上箭头::before { - content: "\F064"; -} - -.van-icon-圆角-下箭头::before { - content: "\F065"; -} - -.van-icon-圆角-右箭头::before { - content: "\F066"; -} - -.van-icon-圆角-左箭头::before { - content: "\F067"; -} - -.van-icon-失败::before { - content: "\F068"; -} - -.van-icon-成功::before { - content: "\F069"; -} diff --git a/packages/icon/local.less b/packages/icon/local.less index 9fb3dafd9..979e3621d 100644 --- a/packages/icon/local.less +++ b/packages/icon/local.less @@ -2,5 +2,5 @@ font-style: normal; font-weight: normal; font-family: 'vant-icon'; - src: url('./vant-icon-7a2fab.ttf') format('truetype'); + src: url('./vant-icon-874007.ttf') format('truetype'); } diff --git a/packages/icon/vant-icon-7a2fab.ttf b/packages/icon/vant-icon-874007.ttf similarity index 91% rename from packages/icon/vant-icon-7a2fab.ttf rename to packages/icon/vant-icon-874007.ttf index 408d29fbf..b8ce72508 100644 Binary files a/packages/icon/vant-icon-7a2fab.ttf and b/packages/icon/vant-icon-874007.ttf differ