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

This commit is contained in:
afc163 2015-07-20 16:20:21 +08:00
commit c6ff87730a
4 changed files with 6 additions and 12 deletions

View File

@ -28,7 +28,7 @@
| disabled | 禁用 | bool | false |
<style>
.code-box-demo .ant-calendar-picker-input {
.code-box-demo .ant-calendar-picker {
width: 200px;
}
</style>

View File

@ -30,17 +30,6 @@
</div>
</div>
</div>
<div class="ant-form-item">
<label class="col-6" for="site5">带按钮的输入框:</label>
<div class="col-16">
<div class="ant-input-group">
<input type="text" class="ant-input" id="site5" placeholder="Search for..." />
<div class="ant-input-group-btn">
<button class="ant-btn" type="button">GO!</button>
</div>
</div>
</div>
</div>
<div class="ant-form-item">
<label class="col-6">输入身份证:</label>
<div class="col-16">

View File

@ -10,6 +10,7 @@
.@{prefixCalendarClass}-picker {
position: relative;
display: inline-block;
width: 100%;
&-icon {
position: absolute;

View File

@ -14,6 +14,10 @@
}
}
.@{prefixCalendarClass}-picker-open .@{prefixCalendarClass}-picker-input {
box-shadow: 0 0 0 2px tint(@border-color, 80%);
}
.@{css-prefix}input-group-addon {
color: @text-color;
border-color: @border-color;