From 86f8ff11600532f44ca756b21332c37d65064911 Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Sun, 28 Jan 2018 14:44:53 +0800
Subject: [PATCH] Input: el-input styles should override el-textarea

---
 examples/docs/en-US/upload.md       |  2 +-
 examples/docs/es/upload.md          |  2 +-
 examples/docs/zh-CN/upload.md       |  2 +-
 packages/theme-chalk/src/input.scss | 98 ++++++++++++++---------------
 4 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/examples/docs/en-US/upload.md b/examples/docs/en-US/upload.md
index 0b5ecfacb..a42e39d34 100644
--- a/examples/docs/en-US/upload.md
+++ b/examples/docs/en-US/upload.md
@@ -254,7 +254,7 @@ Use `list-type` to change the fileList style.
   :on-remove="handleRemove">
   <i class="el-icon-plus"></i>
 </el-upload>
-<el-dialog :visible.sync="dialogVisible" size="tiny">
+<el-dialog :visible.sync="dialogVisible">
   <img width="100%" :src="dialogImageUrl" alt="">
 </el-dialog>
 <script>
diff --git a/examples/docs/es/upload.md b/examples/docs/es/upload.md
index 5a201ebf2..2c7a5f24f 100644
--- a/examples/docs/es/upload.md
+++ b/examples/docs/es/upload.md
@@ -247,7 +247,7 @@ Utilice la propiedad `list-type` para cambiar el estilo a un listado de archivos
   :on-remove="handleRemove">
   <i class="el-icon-plus"></i>
 </el-upload>
-<el-dialog :visible.sync="dialogVisible" size="tiny">
+<el-dialog :visible.sync="dialogVisible">
   <img width="100%" :src="dialogImageUrl" alt="">
 </el-dialog>
 <script>
diff --git a/examples/docs/zh-CN/upload.md b/examples/docs/zh-CN/upload.md
index c95d0455d..54bd67915 100644
--- a/examples/docs/zh-CN/upload.md
+++ b/examples/docs/zh-CN/upload.md
@@ -254,7 +254,7 @@
   :on-remove="handleRemove">
   <i class="el-icon-plus"></i>
 </el-upload>
-<el-dialog :visible.sync="dialogVisible" size="tiny">
+<el-dialog :visible.sync="dialogVisible">
   <img width="100%" :src="dialogImageUrl" alt="">
 </el-dialog>
 <script>
diff --git a/packages/theme-chalk/src/input.scss b/packages/theme-chalk/src/input.scss
index 397b3b751..63d588043 100644
--- a/packages/theme-chalk/src/input.scss
+++ b/packages/theme-chalk/src/input.scss
@@ -1,6 +1,55 @@
 @import "mixins/mixins";
 @import "common/var";
 
+@include b(textarea) {
+  display: inline-block;
+  width: 100%;
+  vertical-align: bottom;
+  font-size: $--font-size-base;
+
+  @include e(inner) {
+    display: block;
+    resize: vertical;
+    padding: 5px 15px;
+    line-height: 1.5;
+    box-sizing: border-box;
+    width: 100%;
+    font-size: inherit;
+    color: $--input-color;
+    background-color: $--input-fill;
+    background-image: none;
+    border: $--input-border;
+    border-radius: $--input-border-radius;
+    transition: $--border-transition-base;
+
+    &::placeholder {
+      color: $--input-placeholder-color;
+    }
+
+    &:hover {
+      border-color: $--input-hover-border;
+    }
+
+    &:focus {
+      outline: none;
+      border-color: $--input-focus-border;
+    }
+  }
+
+  @include when(disabled) {
+    .el-textarea__inner {
+      background-color: $--input-disabled-fill;
+      border-color: $--input-disabled-border;
+      color: $--input-disabled-color;
+      cursor: not-allowed;
+
+      &::placeholder {
+        color: $--input-disabled-placeholder-color;
+      }
+    }
+  }
+}
+
 @include b(input) {
   position: relative;
   font-size: $--font-size-base;
@@ -249,55 +298,6 @@
   }
 }
 
-@include b(textarea) {
-  display: inline-block;
-  width: 100%;
-  vertical-align: bottom;
-  font-size: $--font-size-base;
-
-  @include e(inner) {
-    display: block;
-    resize: vertical;
-    padding: 5px 15px;
-    line-height: 1.5;
-    box-sizing: border-box;
-    width: 100%;
-    font-size: inherit;
-    color: $--input-color;
-    background-color: $--input-fill;
-    background-image: none;
-    border: $--input-border;
-    border-radius: $--input-border-radius;
-    transition: $--border-transition-base;
-
-    &::placeholder {
-      color: $--input-placeholder-color;
-    }
-
-    &:hover {
-      border-color: $--input-hover-border;
-    }
-
-    &:focus {
-      outline: none;
-      border-color: $--input-focus-border;
-    }
-  }
-
-  @include when(disabled) {
-    .el-textarea__inner {
-      background-color: $--input-disabled-fill;
-      border-color: $--input-disabled-border;
-      color: $--input-disabled-color;
-      cursor: not-allowed;
-
-      &::placeholder {
-        color: $--input-disabled-placeholder-color;
-      }
-    }
-  }
-}
-
 /** disalbe default clear on IE */
 .el-input__inner::-ms-clear {
   display: none;