refactor: input-number
parent
2a47de6c57
commit
246e1163bb
|
@ -65,7 +65,9 @@
|
||||||
.@{ant-prefix}-picker-calendar-year-select,
|
.@{ant-prefix}-picker-calendar-year-select,
|
||||||
.@{ant-prefix}-picker-calendar-month-select,
|
.@{ant-prefix}-picker-calendar-month-select,
|
||||||
.@{ant-prefix}-input-group .@{ant-prefix}-select,
|
.@{ant-prefix}-input-group .@{ant-prefix}-select,
|
||||||
.@{ant-prefix}-input-group .@{ant-prefix}-cascader-picker {
|
.@{ant-prefix}-input-group .@{ant-prefix}-cascader-picker,
|
||||||
|
.@{ant-prefix}-input-number-group .@{ant-prefix}-select,
|
||||||
|
.@{ant-prefix}-input-number-group .@{ant-prefix}-cascader-picker {
|
||||||
width: auto;
|
width: auto;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,8 @@
|
||||||
color: @text-color;
|
color: @text-color;
|
||||||
}
|
}
|
||||||
|
|
||||||
.@{ant-prefix}-input-group-addon {
|
.@{ant-prefix}-input-group-addon,
|
||||||
|
.@{ant-prefix}-input-number-group-addon {
|
||||||
color: @text-color;
|
color: @text-color;
|
||||||
border-color: @border-color;
|
border-color: @border-color;
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
margin-left: 4px;
|
margin-left: 4px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&::after {
|
&::after {
|
||||||
.@{form-prefix-cls}-rtl & {
|
.@{form-prefix-cls}-rtl & {
|
||||||
margin: 0 @form-item-label-colon-margin-left 0 @form-item-label-colon-margin-right;
|
margin: 0 @form-item-label-colon-margin-left 0 @form-item-label-colon-margin-right;
|
||||||
|
@ -97,7 +98,13 @@
|
||||||
> .@{ant-prefix}-select .@{ant-prefix}-select-arrow,
|
> .@{ant-prefix}-select .@{ant-prefix}-select-arrow,
|
||||||
> .@{ant-prefix}-select .@{ant-prefix}-select-clear,
|
> .@{ant-prefix}-select .@{ant-prefix}-select-clear,
|
||||||
:not(.@{ant-prefix}-input-group-addon) > .@{ant-prefix}-select .@{ant-prefix}-select-arrow,
|
:not(.@{ant-prefix}-input-group-addon) > .@{ant-prefix}-select .@{ant-prefix}-select-arrow,
|
||||||
:not(.@{ant-prefix}-input-group-addon) > .@{ant-prefix}-select .@{ant-prefix}-select-clear {
|
:not(.@{ant-prefix}-input-group-addon) > .@{ant-prefix}-select .@{ant-prefix}-select-clear,
|
||||||
|
:not(.@{ant-prefix}-input-number-group-addon)
|
||||||
|
> .@{ant-prefix}-select
|
||||||
|
.@{ant-prefix}-select-arrow,
|
||||||
|
:not(.@{ant-prefix}-input-number-group-addon)
|
||||||
|
> .@{ant-prefix}-select
|
||||||
|
.@{ant-prefix}-select-clear {
|
||||||
.@{form-prefix-cls}-rtl & {
|
.@{form-prefix-cls}-rtl & {
|
||||||
right: auto;
|
right: auto;
|
||||||
left: 32px;
|
left: 32px;
|
||||||
|
@ -106,6 +113,9 @@
|
||||||
|
|
||||||
> .@{ant-prefix}-select .@{ant-prefix}-select-selection-selected-value,
|
> .@{ant-prefix}-select .@{ant-prefix}-select-selection-selected-value,
|
||||||
:not(.@{ant-prefix}-input-group-addon)
|
:not(.@{ant-prefix}-input-group-addon)
|
||||||
|
> .@{ant-prefix}-select
|
||||||
|
.@{ant-prefix}-select-selection-selected-value,
|
||||||
|
:not(.@{ant-prefix}-input-number-group-addon)
|
||||||
> .@{ant-prefix}-select
|
> .@{ant-prefix}-select
|
||||||
.@{ant-prefix}-select-selection-selected-value {
|
.@{ant-prefix}-select-selection-selected-value {
|
||||||
.@{form-prefix-cls}-rtl & {
|
.@{form-prefix-cls}-rtl & {
|
||||||
|
@ -121,6 +131,7 @@
|
||||||
margin-left: 19px;
|
margin-left: 19px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-clear {
|
&-clear {
|
||||||
.@{form-prefix-cls}-rtl & {
|
.@{form-prefix-cls}-rtl & {
|
||||||
right: auto;
|
right: auto;
|
||||||
|
|
|
@ -48,26 +48,25 @@
|
||||||
> .@{ant-prefix}-select .@{ant-prefix}-select-arrow,
|
> .@{ant-prefix}-select .@{ant-prefix}-select-arrow,
|
||||||
> .@{ant-prefix}-select .@{ant-prefix}-select-clear,
|
> .@{ant-prefix}-select .@{ant-prefix}-select-clear,
|
||||||
:not(.@{ant-prefix}-input-group-addon) > .@{ant-prefix}-select .@{ant-prefix}-select-arrow,
|
:not(.@{ant-prefix}-input-group-addon) > .@{ant-prefix}-select .@{ant-prefix}-select-arrow,
|
||||||
:not(.@{ant-prefix}-input-group-addon) > .@{ant-prefix}-select .@{ant-prefix}-select-clear {
|
:not(.@{ant-prefix}-input-group-addon) > .@{ant-prefix}-select .@{ant-prefix}-select-clear,
|
||||||
|
:not(.@{ant-prefix}-input-number-group-addon)
|
||||||
|
> .@{ant-prefix}-select
|
||||||
|
.@{ant-prefix}-select-arrow,
|
||||||
|
:not(.@{ant-prefix}-input-number-group-addon)
|
||||||
|
> .@{ant-prefix}-select
|
||||||
|
.@{ant-prefix}-select-clear {
|
||||||
right: 32px;
|
right: 32px;
|
||||||
}
|
}
|
||||||
> .@{ant-prefix}-select .@{ant-prefix}-select-selection-selected-value,
|
> .@{ant-prefix}-select .@{ant-prefix}-select-selection-selected-value,
|
||||||
:not(.@{ant-prefix}-input-group-addon)
|
:not(.@{ant-prefix}-input-group-addon)
|
||||||
|
> .@{ant-prefix}-select
|
||||||
|
.@{ant-prefix}-select-selection-selected-value,
|
||||||
|
:not(.@{ant-prefix}-input-number-group-addon)
|
||||||
> .@{ant-prefix}-select
|
> .@{ant-prefix}-select
|
||||||
.@{ant-prefix}-select-selection-selected-value {
|
.@{ant-prefix}-select-selection-selected-value {
|
||||||
padding-right: 42px;
|
padding-right: 42px;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ======================= Cascader ========================
|
|
||||||
.@{ant-prefix}-cascader-picker {
|
|
||||||
&-arrow {
|
|
||||||
margin-right: 19px;
|
|
||||||
}
|
|
||||||
&-clear {
|
|
||||||
right: 32px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ======================== Picker =========================
|
// ======================== Picker =========================
|
||||||
// Fix issue: https://github.com/ant-design/ant-design/issues/4783
|
// Fix issue: https://github.com/ant-design/ant-design/issues/4783
|
||||||
.@{ant-prefix}-picker {
|
.@{ant-prefix}-picker {
|
||||||
|
@ -179,12 +178,15 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
// fixes https://github.com/ant-design/ant-design/issues/20482
|
// fixes https://github.com/ant-design/ant-design/issues/20482
|
||||||
.@{ant-prefix}-input-group-addon .@{ant-prefix}-select {
|
.@{ant-prefix}-input-group-addon,
|
||||||
&.@{ant-prefix}-select-single:not(.@{ant-prefix}-select-customize-input)
|
.@{ant-prefix}-input-number-group-addon {
|
||||||
.@{ant-prefix}-select-selector {
|
.@{ant-prefix}-select {
|
||||||
background-color: inherit;
|
&.@{ant-prefix}-select-single:not(.@{ant-prefix}-select-customize-input)
|
||||||
border: 0;
|
.@{ant-prefix}-select-selector {
|
||||||
box-shadow: none;
|
background-color: inherit;
|
||||||
|
border: 0;
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue