Merge branch 'master' of github.com:ant-design/ant-design

This commit is contained in:
afc163 2016-07-09 16:04:27 +08:00
commit b9793662ac
2 changed files with 6 additions and 0 deletions

View File

@ -20,6 +20,7 @@ export default class FormItem extends React.Component {
className: React.PropTypes.string,
id: React.PropTypes.string,
children: React.PropTypes.node,
colon: React.PropTypes.bool
}
static contextTypes = {
@ -204,6 +205,7 @@ export default class FormItem extends React.Component {
'ant-row': true,
[`${prefixCls}-item`]: true,
[`${prefixCls}-item-with-help`]: !!this.getHelpMsg(),
[`${prefixCls}-no-colon`]: !this.props.colon,
[`${props.className}`]: !!props.className,
};

View File

@ -97,6 +97,10 @@ input[type="checkbox"] {
.ant-switch {
margin: 4px 0;
}
&.@{form-prefix-cls}-no-colon > label:after {
content: " ";
}
}
.@{form-prefix-cls}-explain {