From 9817ce9981116af9f312b9bce407b98892191d22 Mon Sep 17 00:00:00 2001
From: jingsam <jingsam@163.com>
Date: Wed, 30 Nov 2016 13:25:58 +0800
Subject: [PATCH 1/2] :hammer: Use Icon component in Button

---
 src/components/button/button.vue | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/components/button/button.vue b/src/components/button/button.vue
index 7413b6f3..c22dd582 100644
--- a/src/components/button/button.vue
+++ b/src/components/button/button.vue
@@ -1,7 +1,7 @@
 <template>
     <button :type="htmlType" :class="classes" :disabled="disabled">
-        <i :class="loadingIconClasses" v-if="loading"></i>
-        <i :class="typeIconClasses" v-if="icon && !loading"></i>
+        <Icon class="ivu-load-loop" type="load-c" v-if="loading"></Icon>
+        <Icon :type="icon" v-if="icon && !loading"></Icon>
         <span v-if="showSlot" v-el:slot><slot></slot></span>
     </button>
 </template>
@@ -62,17 +62,6 @@
                         [`${prefixCls}-icon-only`]: !this.showSlot && (!!this.icon || this.loading)
                     }
                 ]
-            },
-            loadingIconClasses () {
-                return `${iconPrefixCls} ivu-load-loop ${iconPrefixCls}-load-c`;
-            },
-            typeIconClasses () {
-                return [
-                    `${iconPrefixCls}`,
-                    {
-                        [`${iconPrefixCls}-${this.icon}`]: !!this.icon
-                    }
-                ]
             }
         },
         compiled () {

From 3029549e40fefedf89bacc60f1c56384cd209cdb Mon Sep 17 00:00:00 2001
From: jingsam <jingsam@163.com>
Date: Wed, 30 Nov 2016 13:28:59 +0800
Subject: [PATCH 2/2] fixup

---
 src/components/button/button.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/button/button.vue b/src/components/button/button.vue
index c22dd582..b64d8e28 100644
--- a/src/components/button/button.vue
+++ b/src/components/button/button.vue
@@ -10,7 +10,6 @@
     import { oneOf } from '../../utils/assist';
 
     const prefixCls = 'ivu-btn';
-    const iconPrefixCls = 'ivu-icon';
 
     export default {
         components: { Icon },