From e73e9506622fc9b8bdf67f6c59f7bdf0b04e2d4f Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 17 May 2018 17:18:23 +0800
Subject: [PATCH] [bugfix] Icon template (#1091)

---
 build/webpack.build.js                        |   4 +++-
 build/webpack.doc.js                          |   6 ++++--
 packages/address-edit/test/index.spec.js      |   1 +
 packages/vant-css/scripts/icon-template.css   |   4 ++--
 packages/vant-css/src/icon-local.css          |   2 +-
 packages/vant-css/src/icon.css                |   2 +-
 ...t-icon-03d6f2.ttf => vant-icon-254016.ttf} | Bin 26120 -> 26120 bytes
 7 files changed, 12 insertions(+), 7 deletions(-)
 rename packages/vant-css/src/{vant-icon-03d6f2.ttf => vant-icon-254016.ttf} (99%)

diff --git a/build/webpack.build.js b/build/webpack.build.js
index a04230b65..eeb44e0bf 100644
--- a/build/webpack.build.js
+++ b/build/webpack.build.js
@@ -2,7 +2,9 @@ const path = require('path');
 const config = require('./webpack.dev.js');
 const isMinify = process.argv.indexOf('-p') !== -1;
 
-module.exports = Object.assign({}, config, {
+delete config.serve;
+
+module.exports = Object.assign(config, {
   mode: 'production',
   entry: {
     'vant': './packages/index.js'
diff --git a/build/webpack.doc.js b/build/webpack.doc.js
index c231f9a9e..933818380 100644
--- a/build/webpack.doc.js
+++ b/build/webpack.doc.js
@@ -1,7 +1,9 @@
 const path = require('path');
-const devConfig = require('./webpack.dev.js');
+const config = require('./webpack.dev.js');
 
-module.exports = Object.assign({}, devConfig, {
+delete config.serve;
+
+module.exports = Object.assign(config, {
   mode: 'production',
   output: {
     path: path.join(__dirname, '../docs/dist'),
diff --git a/packages/address-edit/test/index.spec.js b/packages/address-edit/test/index.spec.js
index 59b98f55a..e24d99d43 100644
--- a/packages/address-edit/test/index.spec.js
+++ b/packages/address-edit/test/index.spec.js
@@ -1,3 +1,4 @@
+/* eslint-disable camelcase */
 import Vue from 'vue';
 import { mount, TransitionStub } from '@vue/test-utils';
 import { renderToString } from '@vue/server-test-utils';
diff --git a/packages/vant-css/scripts/icon-template.css b/packages/vant-css/scripts/icon-template.css
index 2d3918904..6c6aa9394 100644
--- a/packages/vant-css/scripts/icon-template.css
+++ b/packages/vant-css/scripts/icon-template.css
@@ -16,10 +16,9 @@
 
   &__info {
     color: #fff;
-    left: 50%;
+    left: 100%;
     top: -.5em;
     font-size: .5em;
-    margin-left: .8em;
     padding: 0 .3em;
     text-align: center;
     min-width: 1.2em;
@@ -28,6 +27,7 @@
     border-radius: .6em;
     box-sizing: border-box;
     background-color: $red;
+    transform: translateX(-50%);
     font-family: PingFang SC, Helvetica Neue, Arial, sans-serif;
   }
 
diff --git a/packages/vant-css/src/icon-local.css b/packages/vant-css/src/icon-local.css
index 1f4c6581a..451bed048 100644
--- a/packages/vant-css/src/icon-local.css
+++ b/packages/vant-css/src/icon-local.css
@@ -2,5 +2,5 @@
   font-style: normal;
   font-weight: normal;
   font-family: 'vant-icon';
-  src: url('./vant-icon-03d6f2.ttf') format('truetype');
+  src: url('./vant-icon-254016.ttf') format('truetype');
 }
\ No newline at end of file
diff --git a/packages/vant-css/src/icon.css b/packages/vant-css/src/icon.css
index b6a6414ec..81eb8fab9 100644
--- a/packages/vant-css/src/icon.css
+++ b/packages/vant-css/src/icon.css
@@ -4,7 +4,7 @@
   font-style: normal;
   font-weight: normal;
   font-family: 'vant-icon';
-  src: url('https://img.yzcdn.cn/zanui/icon/vant-icon-03d6f2.ttf') format('truetype');
+  src: url('https://img.yzcdn.cn/zanui/icon/vant-icon-254016.ttf') format('truetype');
 }
 
 .van-icon {
diff --git a/packages/vant-css/src/vant-icon-03d6f2.ttf b/packages/vant-css/src/vant-icon-254016.ttf
similarity index 99%
rename from packages/vant-css/src/vant-icon-03d6f2.ttf
rename to packages/vant-css/src/vant-icon-254016.ttf
index c129d7662221353c0eb841fad6bc5a5e17734536..56da0ae76f681a57db48a8045c3d163dfd1985eb 100644
GIT binary patch
delta 48
wcmeA;!`N|#aY7(-u#x1%kg3wipAN_K+k9o<W`4l{1lN_mt%A{;Sr}PT0k1m{!T<mO

delta 48
wcmeA;!`N|#aY7)oo$|wpAycLM_>JTFZN4&aGrwQ}g6k6beK2}63nNP^0FeI<!~g&Q