Merge pull request #17989 from ant-design/fix-range-picker-and-select-broken-style

fix: range picker and select broken style
This commit is contained in:
偏右 2019-07-31 12:08:21 +08:00 committed by GitHub
commit 0b8d14f2de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 9 deletions

View File

@ -12,8 +12,8 @@
border: 0 solid #aaa;
border-width: 1.5px 0 0 1.5px;
border-radius: 1px;
transform: rotate(-45deg) scale(.8);
transition: all .3s;
transform: rotate(-45deg) scale(0.8);
transition: all 0.3s;
content: '';
}
@ -42,7 +42,7 @@
&::before,
&::after {
transform: rotate(135deg) scale(.8);
transform: rotate(135deg) scale(0.8);
}
}
@ -277,9 +277,12 @@
&-last-month-cell &-date,
&-next-month-btn-day &-date {
color: @disabled-color !important;
background: transparent !important;;
border-color: transparent !important;;
&,
&:hover {
color: @disabled-color;
background: transparent;
border-color: transparent;
}
}
&-disabled-cell &-date {

View File

@ -84,7 +84,10 @@
transform: translateX(-50%);
}
.@{calendar-prefix-cls}-today {
.@{calendar-prefix-cls}-today
:not(.@{calendar-prefix-cls}-disabled-cell)
:not(.@{calendar-prefix-cls}-last-month-cell)
:not(.@{calendar-prefix-cls}-next-month-btn-day) {
.@{calendar-prefix-cls}-date {
color: @primary-color;
background: @primary-2;

View File

@ -147,8 +147,9 @@
position: relative;
height: @input-height-base;
cursor: pointer;
.@{select-prefix-cls}-selection__rendered {
margin-right: 25px;
margin-right: 24px;
}
}
@ -196,7 +197,7 @@
height: @input-height-sm;
}
.@{select-prefix-cls}-selection__rendered {
margin: 0 @control-padding-horizontal-sm - 1px;
margin-left: @control-padding-horizontal-sm - 1px;
line-height: @input-height-sm - 2px;
}
.@{select-prefix-cls}-selection--multiple {