From db666dfb4b9eb294880914ac377852a38b8a2851 Mon Sep 17 00:00:00 2001
From: baiyaaaaa <bigpet1991@gmail.com>
Date: Thu, 1 Dec 2016 11:48:35 +0800
Subject: [PATCH] fix input-group style

---
 packages/input/src/input.vue         |  6 ++++--
 packages/theme-default/src/input.css | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/input/src/input.vue b/packages/input/src/input.vue
index f6a828863..73bdc46f6 100644
--- a/packages/input/src/input.vue
+++ b/packages/input/src/input.vue
@@ -4,7 +4,9 @@
     size ? 'el-input--' + size : '',
     {
       'is-disabled': disabled,
-      'el-input-group': $slots.prepend || $slots.append
+      'el-input-group': $slots.prepend || $slots.append,
+      'el-input-group--append': $slots.append,
+      'el-input-group--prepend': $slots.prepend
     }
   ]">
     <template v-if="type !== 'textarea'">
@@ -13,7 +15,7 @@
         <slot name="prepend"></slot>
       </div>
       <!-- input 图标 -->
-      <i class="el-input__icon" :class="[icon ? 'el-icon-' + icon : '']" v-if="icon" @click="handleIconClick"></i>
+      <i class="el-input__icon" :class="'el-icon-' + icon" v-if="icon" @click="handleIconClick"></i>
       <input
         v-if="type !== 'textarea'"
         class="el-input__inner"
diff --git a/packages/theme-default/src/input.css b/packages/theme-default/src/input.css
index c467f7cd3..a8c00e5bd 100644
--- a/packages/theme-default/src/input.css
+++ b/packages/theme-default/src/input.css
@@ -150,16 +150,18 @@
       border-top-left-radius: 0;
       border-bottom-left-radius: 0;
     }
-    & .el-input__inner:first-child {
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
+
+    @m prepend {
+      .el-input__inner {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+      }
     }
-    & .el-input__inner:last-child {
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
-    }
-    & .el-input__inner:not(:first-child):not(:last-child) {
-      border-radius: 0;
+    @m append {
+      .el-input__inner {
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+      }
     }
   }