Merge branch '1.x-stable' of github.com:ant-design/ant-design into 1.x-stable

This commit is contained in:
afc163 2016-09-13 18:27:49 +08:00
commit be81b360fd

View File

@ -341,8 +341,9 @@ form {
color: @warning-color; color: @warning-color;
} }
//input-number //input-number, timepicker
.ant-input-number { .ant-input-number,
.ant-time-picker-input {
border-color: @warning-color; border-color: @warning-color;
box-shadow: 0 0 0 2px fade(@warning-color, 20%); box-shadow: 0 0 0 2px fade(@warning-color, 20%);
&:not([disabled]):hover { &:not([disabled]):hover {
@ -377,12 +378,13 @@ form {
} }
//timepicker //timepicker
.ant-time-picker-picker-icon:after { .ant-time-picker-icon:after {
color: @error-color; color: @error-color;
} }
//input-number //input-number, timepicker
.ant-input-number { .ant-input-number,
.ant-time-picker-input {
border-color: @error-color; border-color: @error-color;
box-shadow: 0 0 0 2px fade(@error-color, 20%); box-shadow: 0 0 0 2px fade(@error-color, 20%);
&:not([disabled]):hover { &:not([disabled]):hover {