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

This commit is contained in:
afc163 2016-06-23 12:32:24 +08:00
commit 230016825e
3 changed files with 11 additions and 0 deletions

View File

@ -151,6 +151,11 @@
.@{checkbox-inner-prefix-cls}-input {
cursor: default;
}
& + span {
color: #ccc;
cursor: @cursor-disabled;
}
}
.@{checkbox-prefix-cls}-wrapper {

View File

@ -127,6 +127,7 @@
&-prev,
&-next {
border: 1px solid @border-color-base;
background-color: #fff;
a {
color: #666;

View File

@ -106,6 +106,11 @@
.@{radio-inner-prefix-cls}-input {
cursor: default;
}
.@{radio-prefix-cls}-disabled + span {
color: #ccc;
cursor: @cursor-disabled;
}
}
span.@{radio-prefix-cls} + * {