github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

fix input-group style

pull/1503/merge
baiyaaaaa 2016-12-01 11:48:35 +08:00 committed by cinwell.li
parent a0bb371de0
commit db666dfb4b
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/input/src/input.vue
View File

@ -4,7 +4,9 @@
size ? 'el-input--' + size : '', size ? 'el-input--' + size : '',
{ {
'is-disabled': disabled, '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'"> <template v-if="type !== 'textarea'">
@ -13,7 +15,7 @@
<slot name="prepend"></slot> <slot name="prepend"></slot>
</div> </div>
<!-- input 图标 --> <!-- 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 <input
v-if="type !== 'textarea'" v-if="type !== 'textarea'"
class="el-input__inner" class="el-input__inner"

16
packages/theme-default/src/input.css
View File

@ -150,16 +150,18 @@
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
& .el-input__inner:first-child {
border-top-right-radius: 0; @m prepend {
border-bottom-right-radius: 0; .el-input__inner {
}
& .el-input__inner:last-child {
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-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;
}
} }
} }