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

fix form inline label bug 

This reverts commit d76d28dd54.

fix form inline label bug
pull/3106/head
baiyaaaaa 2017-02-24 15:01:07 +08:00 committed by 杨奕
parent e204e28320
commit 2d8c887b6a
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/form/src/form-item.vue
View File

@ -84,11 +84,12 @@
return ret; return ret;
}, },
contentStyle() { contentStyle() {
let ret = {}; var ret = {};
const labelWidth = this.labelWidth || this.form.labelWidth; if (this.form.labelPosition === 'top' || this.form.inline) return ret;
const form = this.form; var labelWidth = this.labelWidth || this.form.labelWidth;
if (form.labelPosition === 'top' || form.inline) return ret; if (labelWidth) {
if (labelWidth) ret.marginLeft = labelWidth; ret.marginLeft = labelWidth;
}
return ret; return ret;
}, },
form() { form() {

8
packages/theme-default/src/form.css
View File

@ -21,10 +21,16 @@
margin-right: 10px; margin-right: 10px;
vertical-align: top; vertical-align: top;
} }
& .el-form-item__label, & .el-form-item__label {
float: none;
display: inline-block;
}
& .el-form-item__content { & .el-form-item__content {
display: inline-block; display: inline-block;
} }
&.el-form--label-top .el-form-item__content {
display: block;
}
} }
} }
@b form-item { @b form-item {