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

This commit is contained in:
yiminghe 2015-07-20 17:49:27 +08:00
commit bcde1bd6d6
2 changed files with 5 additions and 3 deletions

View File

@ -43,10 +43,10 @@ React.render(
<form className="ant-form-horizontal">
<div className="ant-form-item">
<label className="col-6" required>Input-Number:</label>
<div className="col-6">
<div className="col-10">
<InputNumber min={1} max={10} defaultValue={3} onChange={onInputNumberChange} style={{width:100}}/>
<span className="ant-form-text"> 台机器</span>
</div>
<div className="col-3"><p className="ant-form-text"> 台机器</p></div>
</div>
<div className="ant-form-item ant-form-item-compact">
<label className="col-6" required>

View File

@ -85,6 +85,7 @@ input[type="checkbox"] {
}
.@{css-prefix}form-text, .@{css-prefix}form-split {
display: inline-block;
margin: 0!important;
padding-top: 7px;
padding-bottom: 7px;
@ -155,7 +156,8 @@ form {
}
.@{inputNumberPrefixCls} {
margin: 2px 0;
margin-top: -1px;
margin-right: 8px;
}
}