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

This commit is contained in:
afc163 2015-08-17 13:59:28 +08:00
commit b6f34c5dde
5 changed files with 21 additions and 21 deletions

View File

@ -22,15 +22,15 @@ function handleSelectChange(value) {
React.render(
<form className="ant-form-horizontal">
<div className="ant-form-item">
<label className="col-6">输入框:</label>
<label htmlFor="control-input" className="col-6">输入框:</label>
<div className="col-14">
<input type="text" className="ant-input" placeholder="Please enter..." />
<input type="text" className="ant-input" id="control-input" placeholder="Please enter..." />
</div>
</div>
<div className="ant-form-item">
<label className="col-6">文本域:</label>
<label htmlFor="control-textarea" className="col-6">文本域:</label>
<div className="col-14">
<textarea className="ant-input"></textarea>
<textarea className="ant-input" id="control-textarea"></textarea>
</div>
</div>
<div className="ant-form-item">

View File

@ -20,13 +20,13 @@ var RadioGroup = antd.RadioGroup;
React.render(
<form className="ant-form-horizontal">
<div className="ant-form-item ant-form-item-compact">
<label for="userName" className="col-6" required>用户名:</label>
<label htmlFor="userName" className="col-6" required>用户名:</label>
<div className="col-6">
<p className="ant-form-text">大眼萌 minion</p>
</div>
</div>
<div className="ant-form-item">
<label for="password" className="col-6" required>密码:</label>
<label htmlFor="password" className="col-6" required>密码:</label>
<div className="col-14">
<input className="ant-input" type="password" id="password" placeholder="请输入密码"/>
</div>
@ -41,9 +41,9 @@ React.render(
</div>
</div>
<div className="ant-form-item">
<label for="password" className="col-6" required>备注:</label>
<label htmlFor="remark" className="col-6" required>备注:</label>
<div className="col-14">
<textarea className="ant-input" placeholder="随便写"></textarea>
<textarea className="ant-input" id="remark" placeholder="随便写"></textarea>
<p className="ant-form-explain">随便写点什么</p>
</div>
</div>

View File

@ -12,12 +12,12 @@ var Checkbox = antd.Checkbox;
React.render(
<form className="ant-form-inline">
<div className="ant-form-item">
<label for="userName">账户:</label>
<label htmlFor="userName">账户:</label>
<input className="ant-input" type="text" id="userName" placeholder="请输入账户名" />
</div>
<div className="ant-form-item">
<label for="password">密码:</label>
<input className="ant-input" type="password" id="password" placeholder="请输入密码" />
<label htmlFor="password2">密码:</label>
<input className="ant-input" type="password" id="password2" placeholder="请输入密码" />
</div>
<div className="ant-form-item">
<label className="ant-checkbox-inline">

View File

@ -13,7 +13,7 @@ var Option = Select.Option;
React.render(
<form className="ant-form-horizontal">
<div className="ant-form-item">
<label className="col-6" for="site1">标签输入框:</label>
<label className="col-6" htmlFor="site1">标签输入框:</label>
<div className="col-16">
<div className="ant-input-group">
<span className="ant-input-group-addon" id="basic-addon1">Http://</span>
@ -22,7 +22,7 @@ React.render(
</div>
</div>
<div className="ant-form-item">
<label className="col-6" for="site3">标签输入框:</label>
<label className="col-6" htmlFor="site3">标签输入框:</label>
<div className="col-16">
<div className="ant-input-group">
<span className="ant-input-group-addon" id="basic-addon3">Http://</span>
@ -32,7 +32,7 @@ React.render(
</div>
</div>
<div className="ant-form-item">
<label className="col-6" for="site4">select 标签输入框:</label>
<label className="col-6" htmlFor="site4">select 标签输入框:</label>
<div className="col-16">
<div className="ant-input-group">
<input type="text" className="ant-input" id="site4" placeholder="www.mysite" />
@ -48,7 +48,7 @@ React.render(
</div>
</div>
<div className="ant-form-item">
<label className="col-6">输入身份证:</label>
<label className="col-6" htmlFor="certNo1">输入身份证:</label>
<div className="col-16">
<div className="ant-input-group">
<div className="col-6">
@ -67,7 +67,7 @@ React.render(
</div>
</div>
<div className="ant-form-item">
<label className="col-6">电话号码:</label>
<label className="col-6" htmlFor="tel1">电话号码:</label>
<div className="col-16">
<div className="row">
<div className="col-4">

View File

@ -57,19 +57,19 @@ React.render(
</div>
</div>
<div className="ant-form-item">
<label for="" className="col-8" required>Switch 开关:</label>
<label htmlFor="" className="col-8" required>Switch 开关:</label>
<div className="col-10">
<Switch />
</div>
</div>
<div className="ant-form-item">
<label for="" className="col-8" required>Slider 滑动输入条:</label>
<label htmlFor="" className="col-8" required>Slider 滑动输入条:</label>
<div className="col-10">
<Slider marks={["A","B","C","D","E","F","G"]} />
</div>
</div>
<div className="ant-form-item">
<label for="" className="col-8" required>Select 选择器:</label>
<label htmlFor="" className="col-8" required>Select 选择器:</label>
<div className="col-16">
<Select size="large" value="lucy" style={{width:200}} onChange={handleSelectChange}>
<Option value="jack">jack</Option>
@ -80,7 +80,7 @@ React.render(
</div>
</div>
<div className="ant-form-item">
<label for="" className="col-8" required>Datepicker 日期选择框:</label>
<label htmlFor="" className="col-8" required>Datepicker 日期选择框:</label>
<div className="col-6">
<Datepicker />
</div>
@ -92,7 +92,7 @@ React.render(
</div>
</div>
<div className="ant-form-item has-error">
<label for="" className="col-8" required>Datepicker 校验:</label>
<label htmlFor="" className="col-8" required>Datepicker 校验:</label>
<div className="col-6">
<Datepicker />
</div>