From b6af2c2a0027ffdf29315374799dadf67c4c7c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Wed, 17 Jan 2018 18:32:52 +0800
Subject: [PATCH] update Button styles

---
 examples/routers/button.vue       | 38 +++++++++++++++++++++++++++++++
 src/styles/components/button.less |  5 ----
 src/styles/mixins/button.less     | 16 +++++++++++++
 3 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/examples/routers/button.vue b/examples/routers/button.vue
index 0e053646..6e327306 100644
--- a/examples/routers/button.vue
+++ b/examples/routers/button.vue
@@ -1,5 +1,43 @@
 <template>
     <div>
+        <Button>Default</Button>
+        <Button type="primary">Primary</Button>
+        <Button type="ghost">Ghost</Button>
+        <Button type="dashed">Dashed</Button>
+        <Button type="text">Text</Button>
+        <br><br>
+        <Button type="info">Info</Button>
+        <Button type="success">Success</Button>
+        <Button type="warning">Warning</Button>
+        <Button type="error">Error</Button>
+        <br><br>
+        <Button type="primary" shape="circle" icon="ios-search"></Button>
+        <Button type="primary" icon="ios-search">Search</Button>
+        <Button type="primary" shape="circle" icon="ios-search">Search</Button>
+        <Button type="primary" shape="circle">Circle</Button>
+        <br><br>
+        <Button type="ghost" shape="circle" icon="ios-search"></Button>
+        <Button type="ghost" icon="ios-search">Search</Button>
+        <Button type="ghost" shape="circle" icon="ios-search">Search</Button>
+        <Button type="ghost" shape="circle">Circle</Button>
+        <br><br>
+        <Button>Default</Button>
+        <Button disabled>Default(Disabled)</Button>
+        <br>
+        <Button type="primary">Primary</Button>
+        <Button type="primary" disabled>Primary(Disabled)</Button>
+        <br>
+        <Button type="ghost">Ghost</Button>
+        <Button type="ghost" disabled>Ghost(Disabled)</Button>
+        <br>
+        <Button type="dashed">Dashed</Button>
+        <Button type="dashed" disabled>Dashed(Disabled)</Button>
+        <br>
+        <Button type="text">Text</Button>
+        <Button type="text" disabled>Text(Disabled)</Button>
+        <br><br>
+
+        <br><br>
         <h4>基本</h4>
         <br><br>
         <Button-group>
diff --git a/src/styles/components/button.less b/src/styles/components/button.less
index 72bb640b..dd3c97cd 100644
--- a/src/styles/components/button.less
+++ b/src/styles/components/button.less
@@ -4,11 +4,6 @@
     .btn;
     .btn-default;
 
-    &.@{btn-prefix-cls}-focused {
-        box-shadow: 0 0 2px @link-hover-color, 0 0 2px @link-hover-color, 0 0 2px @link-hover-color, 0 0 2px @link-hover-color;
-        z-index: 1;
-    }
-
     &-long{
         width: 100%;
     }
diff --git a/src/styles/mixins/button.less b/src/styles/mixins/button.less
index b99e852b..930765a2 100644
--- a/src/styles/mixins/button.less
+++ b/src/styles/mixins/button.less
@@ -186,6 +186,7 @@
     &.active {
         .button-color(shade(@primary-color, 5%); white; shade(@primary-color, 5%));
     }
+    .active-btn-color(@primary-color);
 }
 
 // Primary
@@ -198,6 +199,7 @@
     &.active {
         color: @btn-primary-color;
     }
+    .active-btn-color(@primary-color);
 }
 
 // Ghost
@@ -213,6 +215,7 @@
     &.active {
         .button-color(shade(@primary-color, 5%); @btn-ghost-bg; shade(@primary-color, 5%));
     }
+    .active-btn-color(@primary-color);
 }
 
 // Dashed
@@ -229,6 +232,7 @@
     &.active {
         .button-color(shade(@primary-color, 5%); @btn-ghost-bg; shade(@primary-color, 5%));
     }
+    .active-btn-color(@primary-color);
 }
 
 // Text
@@ -257,9 +261,19 @@
     &.active {
         .button-color(shade(@primary-color, 5%); @btn-ghost-bg; transparent);
     }
+    .active-btn-color(@primary-color);
 }
 
 // Color
+// for tabindex
+.active-btn-color(@color) {
+    transition: all @transition-time @ease-in-out;
+    &.@{btn-prefix-cls}-focused {
+
+        box-shadow: 0 0 0 2px fade(@color, 20%);
+        z-index: 1;
+    }
+}
 .btn-color(@color) {
     .button-variant(@btn-primary-color; @color; @color);
 
@@ -269,6 +283,8 @@
     &.active {
         color: @btn-primary-color;
     }
+
+    .active-btn-color(@color);
 }
 
 // Circle for Icon