From 771bd7eba25742b59f1fbbc8e82028bf4e247e73 Mon Sep 17 00:00:00 2001
From: ZWkang <907747874@qq.com>
Date: Wed, 27 Sep 2017 16:54:44 +0800
Subject: [PATCH 1/5] fix button actived had 1px blank

---
 packages/vant-css/src/button.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/vant-css/src/button.css b/packages/vant-css/src/button.css
index 7a3356dd1..8416fa779 100644
--- a/packages/vant-css/src/button.css
+++ b/packages/vant-css/src/button.css
@@ -15,10 +15,10 @@
   &::before {
     content: " ";
     position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+    top: -1px;
+    left: -1px;
+    right: -1px;
+    bottom: -1px;
     opacity: 0;
     background-color: $black;
     border-radius: inherit; /* inherit parent's border radius */

From 9d7417b386e4e8135c0e7f3e39b9e33c0a880b68 Mon Sep 17 00:00:00 2001
From: kang <907747874@qq.com>
Date: Wed, 27 Sep 2017 18:11:16 +0800
Subject: [PATCH 2/5] fix button actived 1px blank

---
 packages/vant-css/src/button.css | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/vant-css/src/button.css b/packages/vant-css/src/button.css
index 8416fa779..1fd62f0e8 100644
--- a/packages/vant-css/src/button.css
+++ b/packages/vant-css/src/button.css
@@ -15,13 +15,16 @@
   &::before {
     content: " ";
     position: absolute;
-    top: -1px;
-    left: -1px;
-    right: -1px;
-    bottom: -1px;
+    top: 50%;
+    left: 50%;
     opacity: 0;
-    background-color: $black;
-    border-radius: inherit; /* inherit parent's border radius */
+    width: 100%;
+    height: 100%;
+    border: inherit;
+    border-color: #000;
+    background-color: #000;
+    border-radius: inherit;/* inherit parent's border radius */
+    transform: translate3d(-50%, -50%, 0); 
   }
 
   &:not([disabled]):active::before {

From c3b24aa0244a869a535235e0b86c23ccde1b8450 Mon Sep 17 00:00:00 2001
From: kang <907747874@qq.com>
Date: Wed, 27 Sep 2017 18:12:38 +0800
Subject: [PATCH 3/5] Update button.css

---
 packages/vant-css/src/button.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/vant-css/src/button.css b/packages/vant-css/src/button.css
index 1fd62f0e8..7dbd1050f 100644
--- a/packages/vant-css/src/button.css
+++ b/packages/vant-css/src/button.css
@@ -21,8 +21,8 @@
     width: 100%;
     height: 100%;
     border: inherit;
-    border-color: #000;
-    background-color: #000;
+    border-color: $black;
+    background-color: $black;
     border-radius: inherit;/* inherit parent's border radius */
     transform: translate3d(-50%, -50%, 0); 
   }

From 3de884fbd99c11a83e7ea3c8f537bdd7e323d354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 28 Sep 2017 10:42:25 +0800
Subject: [PATCH 4/5] fix: get-components should ignore .DS_Store in macOS

---
 build/bin/get-components.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/bin/get-components.js b/build/bin/get-components.js
index 9cc7a71fe..08b3092d7 100644
--- a/build/bin/get-components.js
+++ b/build/bin/get-components.js
@@ -3,6 +3,6 @@ const path = require('path');
 
 module.exports = function() {
   const dirs = fs.readdirSync(path.resolve(__dirname, '../../packages'));
-  const excludes = ['index.js', 'vant-css', 'mixins', 'utils'];
+  const excludes = ['index.js', 'vant-css', 'mixins', 'utils', '.DS_Store'];
   return dirs.filter(dirName => excludes.indexOf(dirName) === -1)
 }

From 5d55898c63e6c4bc65d358dc66e6615a676ce082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 28 Sep 2017 10:46:58 +0800
Subject: [PATCH 5/5] delete Makefile

---
 Makefile          | 18 ------------------
 README.md         |  8 --------
 README.zh-CN.md   | 10 +---------
 build/bin/init.js | 31 -------------------------------
 4 files changed, 1 insertion(+), 66 deletions(-)
 delete mode 100644 Makefile
 delete mode 100644 build/bin/init.js

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 1a6b62bb1..000000000
--- a/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-.PHONY: test
-usage = "\
-Usage:                       make <option> \n\n\
-init componentname           初始化一个新组件，请忽视makefile的报错  \n\n\
-\n"
-
-
-default:
-	@echo $(usage)
-
-init:
-	node build/bin/init.js $(filter-out $@,$(MAKECMDGOALS))
-
-dev:
-	npm run dev
-
-test:
-	npm run test
diff --git a/README.md b/README.md
index 2a90cd0c1..bf95a1452 100644
--- a/README.md
+++ b/README.md
@@ -57,14 +57,6 @@ Vue.use(vant);
  
 ## Development
 
-### Add a new component
-
-```shell
-make init componentName
-```
-
-### Start coding
-
 Start development mode:
 
 ```shell
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 6cb129656..dcaa05ca6 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -55,15 +55,7 @@ Vue.use(vant);
 
 ## 三、开发
 
-### 1. 新建一个组件
-
-```shell
-make init componentName
-```
-
-### 2. 示例预览
-
-在`docs/nav.config.json`文件里合适的地方写入组件声明，根据组件类型（JS组件，CSS组件，Form等）进行区分 在`docs/examples-docs`目录里新建同名的md文件，如`waterfall.md`，在项目的根目录下执行以下命令，启动server：
+在`docs/src/doc.config.js`文件里合适的地方写入组件声明，根据组件类型（JS组件，CSS组件，Form等）进行区分，在`docs/examples-docs`目录里新建同名的 md 文件，如`waterfall.md`，在项目的根目录下执行以下命令，启动 server：
 
 ```shell
 npm run dev
diff --git a/build/bin/init.js b/build/bin/init.js
deleted file mode 100644
index 1cc94dc86..000000000
--- a/build/bin/init.js
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env node
-const ch = require('child_process');
-const gulp = require('gulp');
-const runSequence = require('run-sequence');
-const gutil = require('gulp-util');
-const fileSave = require('file-save');
-const path = require('path');
-const exec = ch.exec;
-
-if (!process.argv[2]) {
-  console.error('[组件名]必填.');
-  process.exit(1);
-}
-
-const name = process.argv[2];
-
-
-// 项目规范文件拷贝
-gulp.task('copy', function(callback) {
-  gutil.log(gutil.colors.yellow('-------> 开始初始化'));
-
-  exec('cd packages && git clone git@gitlab.qima-inc.com:fe/vue-seed.git ' + name, function(err, stdout, stderr) {
-    gutil.log('-------> 拉取 vue-seed');
-    exec('rm -rf ./packages/' + name + '/.git', function(err, stdout, stderr) {
-      gutil.log('-------> ' + name + '组件初始化成功');
-      callback();
-    });
-  });
-});
-
-runSequence('copy');