diff --git a/components/cascader/style/index.less b/components/cascader/style/index.less index 7240d8e8e2e9..5de52826eb3e 100644 --- a/components/cascader/style/index.less +++ b/components/cascader/style/index.less @@ -13,7 +13,7 @@ background-color: transparent !important; cursor: pointer; width: 100%; - position: static; + position: relative; } &-picker-show-search &-input.@{ant-prefix}-input { diff --git a/components/input/style/mixin.less b/components/input/style/mixin.less index 263b6644179a..27e27af7cb04 100644 --- a/components/input/style/mixin.less +++ b/components/input/style/mixin.less @@ -263,6 +263,21 @@ display: block; .clearfix; + &-addon, + &-wrap, + > .@{inputClass} { + &:not(:first-child):not(:last-child) { + border-right-width: 1px; + border-right-color: transparent; + &:hover { + .hover(); + } + &:focus { + .active(); + } + } + } + & > * { border-radius: 0; border-right-width: 0; @@ -289,7 +304,14 @@ & > .@{ant-prefix}-mention-wrapper .@{ant-prefix}-mention-editor, & > .@{ant-prefix}-time-picker .@{ant-prefix}-time-picker-input { border-radius: 0; - border-right-width: 0; + border-right-width: 1px; + border-right-color: transparent; + &:hover { + .hover(); + } + &:focus { + .active(); + } } & > *:first-child, @@ -308,11 +330,22 @@ & > .@{ant-prefix}-calendar-picker:last-child .@{ant-prefix}-input, & > .@{ant-prefix}-select-auto-complete:last-child .@{ant-prefix}-input, & > .@{ant-prefix}-cascader-picker:last-child .@{ant-prefix}-input, + & > .@{ant-prefix}-cascader-picker-focused:last-child .@{ant-prefix}-input, & > .@{ant-prefix}-mention-wrapper:last-child .@{ant-prefix}-mention-editor, & > .@{ant-prefix}-time-picker:last-child .@{ant-prefix}-time-picker-input { border-top-right-radius: @border-radius-base; border-bottom-right-radius: @border-radius-base; border-right-width: 1px; + border-right-color: @input-border-color; + &:hover { + .hover(); + } + &:focus { + .active(); + .@{ant-prefix}-cascader-input { + .active(); + } + } } } }