From 2c3cc3c2968dfb5beff9f2a7319579502306b7ff Mon Sep 17 00:00:00 2001
From: jiangruowei <jiangruowei@youzan.com>
Date: Mon, 13 Feb 2017 18:05:14 +0800
Subject: [PATCH 1/2] fix: ui tweaks

---
 docs/examples/switch.md         | 35 ++++++++++++++++++---------------
 packages/switch/src/switch.pcss |  6 ++++++
 packages/switch/src/switch.vue  |  2 +-
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/docs/examples/switch.md b/docs/examples/switch.md
index e8668600e..400912c95 100644
--- a/docs/examples/switch.md
+++ b/docs/examples/switch.md
@@ -12,11 +12,7 @@ export default {
   },
   methods: {
     updateState(newState) {
-      console.log('changing');
       this.switchState = newState;
-    },
-    handleClick() {
-      alert('click');
     }
   }
 };
@@ -26,12 +22,15 @@ export default {
     @component switch {
       padding: 0 15px 15px;
 
-      @descendent sample {
-        margin: 0 15px;
+      @descendent wrapper {
+        margin: 30px;
+        width: 100px;
+        float: left;
+        text-align: center;
       }
 
       @descendent text {
-        margin-right: 20px;
+        margin: 20px 0;
       }
     }
   }
@@ -44,9 +43,14 @@ export default {
 :::demo 样例代码
 ```html
 <div class="page-switch">
-  <span class="page-switch-text">Switch state: {{switchStateText}}</span>
-  <o2-switch class="page-switch-sample" :checked="switchState" :on-change="updateState"></o2-switch>
-  <o2-switch class="page-switch-sample" :checked="false" :disabled="true"></o2-switch>
+  <div class="page-switch-wrapper">
+    <o2-switch class="some-customized-class" :checked="switchState" :on-change="updateState"></o2-switch>
+    <div class="page-switch-text">{{switchStateText}}</div>
+  </div>
+  <div class="page-switch-wrapper">
+    <o2-switch class="some-customized-class" :checked="true" :disabled="true"></o2-switch>
+    <div class="page-switch-text">OFF, DISABLED</div>
+  </div>
 </div>
 ```
 
@@ -55,17 +59,16 @@ export default {
 export default {
   data() {
     return {
-      switchState: false
+      switchState: true
     };
   },
   computed: {
     switchStateText() {
-      return this.switchState ? 'on' : 'off';
+      return this.switchState ? ' ON' : 'OFF';
     }
   },
   methods: {
     updateState(newState) {
-      console.log('changing');
       this.switchState = newState;
     }
   }
@@ -77,7 +80,7 @@ export default {
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
-| checked | 开关状态 | boolean  | false          | true,false    |
-| loading | loading状态 | boolean  | false          | true,false    |
-| disabled | 禁用状态 | boolean  | false          | true,false    |
+| checked | 开关状态 | boolean  | false          | true, false    |
+| loading | loading状态 | boolean  | false          | true, false    |
+| disabled | 禁用状态 | boolean  | false          | true, false    |
 | onChange | 回调 | function  | function（）{}      | -    |
diff --git a/packages/switch/src/switch.pcss b/packages/switch/src/switch.pcss
index 0ac3f03e4..38af63000 100644
--- a/packages/switch/src/switch.pcss
+++ b/packages/switch/src/switch.pcss
@@ -29,11 +29,17 @@
     @when on {
       background-color: #44db5e;
       border-color: #44db5e;
+      @descendent node {
+        left: 0;
+      }
     }
 
     @when off {
       background-color: #fff;
       border-color: rgba(0, 0, 0, .1);
+      @descendent node {
+        right: 0;
+      }
     }
 
     @when loading {
diff --git a/packages/switch/src/switch.vue b/packages/switch/src/switch.vue
index 7c7d2fc0f..0b8413dce 100644
--- a/packages/switch/src/switch.vue
+++ b/packages/switch/src/switch.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="o2-switch" :class="['is-' + switchState]" @click="toggleState">
-    <div class="o2-switch-node"></div>
+    <div class="o2-switch-node" :class="['is-' + switchState]"></div>
   </div>
 </template>
 

From 72a60dc3e11651e0d29cb5bba4da329468be1934 Mon Sep 17 00:00:00 2001
From: niunai <colonD.wny@gmail.com>
Date: Wed, 15 Feb 2017 17:47:36 +0800
Subject: [PATCH 2/2] add border

---
 .eslintignore                      |  1 +
 packages/button/src/button.pcss    |  3 +++
 packages/button/src/button.vue     | 23 ++++++-----------------
 packages/zenui/src/common/var.pcss | 11 +++++++----
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 8d1a11e8d..72bf17083 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,3 +1,4 @@
 lib/
 dist/
 node_modules/
+build/
diff --git a/packages/button/src/button.pcss b/packages/button/src/button.pcss
index 44471eb30..2549e72ac 100644
--- a/packages/button/src/button.pcss
+++ b/packages/button/src/button.pcss
@@ -28,16 +28,19 @@
     @modifier default {
       color: $button-default-color;
       background-color: $button-default-background-color;
+      border: 1px solid $button-default-border-color;
     }
 
     @modifier primary {
       color: $button-primary-color;
       background-color: $button-primary-background-color;
+      border: 1px solid $button-primary-border-color;
     }
 
     @modifier danger {
       color: $button-danger-color;
       background-color: $button-danger-background-color;
+      border: 1px solid $button-danger-border-color;
     }
 
     @modifier large {
diff --git a/packages/button/src/button.vue b/packages/button/src/button.vue
index 3ad85c5e7..06fb5ec8b 100644
--- a/packages/button/src/button.vue
+++ b/packages/button/src/button.vue
@@ -32,15 +32,13 @@
  * @example
  * <o2-button size="large" type="primary">按钮</o2-button>
  */
+
+const allowedSize = ['mini', 'small', 'normal', 'large'];
+const allowedType = ['default', 'danger', 'primary'];
+
 export default {
   name: 'o2-button',
 
-  methods: {
-    handleClick(e) {
-      this.$emit('click', e);
-    }
-  },
-
   props: {
     disabled: Boolean,
     loading: Boolean,
@@ -49,23 +47,14 @@ export default {
       type: String,
       default: 'default',
       validator(value) {
-        return [
-          'default',
-          'danger',
-          'primary'
-        ].indexOf(value) > -1;
+        return allowedSize.indexOf(value) > -1;
       }
     },
     size: {
       type: String,
       default: 'normal',
       validator(value) {
-        return [
-          'mini',
-          'small',
-          'normal',
-          'large'
-        ].indexOf(value) > -1;
+        return allowedType.indexOf(value) > -1;
       }
     }
   }
diff --git a/packages/zenui/src/common/var.pcss b/packages/zenui/src/common/var.pcss
index e36d8d778..00c165b40 100644
--- a/packages/zenui/src/common/var.pcss
+++ b/packages/zenui/src/common/var.pcss
@@ -17,12 +17,15 @@ $c-blue: #38f;
 $c-background: #f8f8f8;
 
 /* 按钮颜色 */
-$button-default-color: $c-white;
-$button-default-background-color: $c-green-wx;
-$button-primary-color: $c-black;
-$button-primary-background-color: $c-white;
+$button-primary-color: $c-white;
+$button-primary-background-color: $c-green-wx;
+$button-primary-border-color: #0a0;
+$button-default-color: $c-black;
+$button-default-background-color: $c-white;
+$button-default-border-color: #bbb;
 $button-danger-color: $c-white;
 $button-danger-background-color: #f44;
+$button-danger-border-color: #e33;
 
 :root{