Browse Source

style: fix cascader RTL small icon (#22191)

pull/22199/head
xrkffgg 5 years ago
committed by GitHub
parent
commit
8d2c959711
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 49
      components/cascader/style/index.less
  2. 1
      components/cascader/style/index.tsx
  3. 79
      components/cascader/style/rtl.less

49
components/cascader/style/index.less

@ -3,8 +3,6 @@
@import '../../input/style/mixin'; @import '../../input/style/mixin';
@cascader-prefix-cls: ~'@{ant-prefix}-cascader'; @cascader-prefix-cls: ~'@{ant-prefix}-cascader';
@picker-rtl-cls: ~'@{cascader-prefix-cls}-picker-rtl';
@menu-rtl-cls: ~'@{cascader-prefix-cls}-menu-rtl';
.@{cascader-prefix-cls} { .@{cascader-prefix-cls} {
.reset-component; .reset-component;
@ -19,12 +17,6 @@
// because input.less will compile after cascader.less // because input.less will compile after cascader.less
background-color: transparent !important; background-color: transparent !important;
cursor: pointer; cursor: pointer;
.@{picker-rtl-cls} & {
padding-right: @input-padding-horizontal-base;
padding-left: 24px;
text-align: right;
}
} }
&-picker-show-search &-input.@{ant-prefix}-input { &-picker-show-search &-input.@{ant-prefix}-input {
@ -80,11 +72,6 @@
line-height: 20px; line-height: 20px;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
.@{picker-rtl-cls} & {
padding: 0 @control-padding-horizontal 0 20px;
text-align: right;
}
} }
&-clear { &-clear {
@ -105,11 +92,6 @@
&:hover { &:hover {
color: @text-color-secondary; color: @text-color-secondary;
} }
.@{picker-rtl-cls} & {
right: auto;
left: @control-padding-horizontal;
}
} }
&:hover &-clear { &:hover &-clear {
@ -132,11 +114,6 @@
&&-expand { &&-expand {
transform: rotate(180deg); transform: rotate(180deg);
} }
.@{picker-rtl-cls} & {
right: auto;
left: @control-padding-horizontal;
}
} }
} }
@ -148,11 +125,6 @@
&-picker-small &-picker-clear, &-picker-small &-picker-clear,
&-picker-small &-picker-arrow { &-picker-small &-picker-arrow {
right: @control-padding-horizontal-sm; right: @control-padding-horizontal-sm;
.@{picker-rtl-cls} & {
right: auto;
left: @control-padding-horizontal;
}
} }
&-menus { &-menus {
@ -215,17 +187,6 @@
&:only-child { &:only-child {
border-radius: @border-radius-base; border-radius: @border-radius-base;
} }
&-rtl {
direction: rtl;
border-right: none;
border-left: @border-width-base @border-style-base @border-color-split;
&:last-child {
margin-right: 0;
margin-left: -1px;
border-left-color: transparent;
border-radius: 0 0 4px 4px;
}
}
} }
&-menu-item { &-menu-item {
padding: @cascader-dropdown-vertical-padding @control-padding-horizontal; padding: @cascader-dropdown-vertical-padding @control-padding-horizontal;
@ -253,11 +214,6 @@
&-expand { &-expand {
position: relative; position: relative;
padding-right: 24px; padding-right: 24px;
.@{menu-rtl-cls} & {
padding-right: @control-padding-horizontal;
padding-left: 24px;
}
} }
&-expand &-expand-icon, &-expand &-expand-icon,
@ -267,11 +223,6 @@
position: absolute; position: absolute;
right: @control-padding-horizontal; right: @control-padding-horizontal;
color: @text-color-secondary; color: @text-color-secondary;
.@{menu-rtl-cls} & {
right: auto;
left: @control-padding-horizontal;
}
} }
& &-keyword { & &-keyword {

1
components/cascader/style/index.tsx

@ -1,5 +1,6 @@
import '../../style/index.less'; import '../../style/index.less';
import './index.less'; import './index.less';
import './rtl.less';
// style dependencies // style dependencies
import '../../empty/style'; import '../../empty/style';

79
components/cascader/style/rtl.less

@ -0,0 +1,79 @@
@import '../../style/themes/index';
@import '../../style/mixins/index';
@import '../../input/style/mixin';
@cascader-prefix-cls: ~'@{ant-prefix}-cascader';
@picker-rtl-cls: ~'@{cascader-prefix-cls}-picker-rtl';
@menu-rtl-cls: ~'@{cascader-prefix-cls}-menu-rtl';
.@{cascader-prefix-cls} {
&-input.@{ant-prefix}-input {
.@{picker-rtl-cls} & {
padding-right: @input-padding-horizontal-base;
padding-left: 24px;
text-align: right;
}
}
&-picker {
&-label {
.@{picker-rtl-cls} & {
padding: 0 @control-padding-horizontal 0 20px;
text-align: right;
}
}
&-clear {
.@{picker-rtl-cls} & {
right: auto;
left: @control-padding-horizontal;
}
}
&-arrow {
.@{picker-rtl-cls} & {
right: auto;
left: @control-padding-horizontal;
}
}
}
&-picker-small &-picker-clear,
&-picker-small &-picker-arrow {
.@{picker-rtl-cls}& {
right: auto;
left: @control-padding-horizontal-sm;
}
}
&-menu {
&-rtl {
direction: rtl;
border-right: none;
border-left: @border-width-base @border-style-base @border-color-split;
&:last-child {
margin-right: 0;
margin-left: -1px;
border-left-color: transparent;
border-radius: 0 0 4px 4px;
}
}
}
&-menu-item {
&-expand {
.@{menu-rtl-cls} & {
padding-right: @control-padding-horizontal;
padding-left: 24px;
}
}
&-expand &-expand-icon,
&-loading-icon {
.@{menu-rtl-cls} & {
right: auto;
left: @control-padding-horizontal;
}
}
}
}
Loading…
Cancel
Save