From eba8b0379b789d50173f9b458a0c927847c9d575 Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Fri, 1 Nov 2019 14:22:22 +0800 Subject: [PATCH] =?UTF-8?q?inputGroup=20=E4=B8=8B=20input=20=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E9=94=99=E4=B9=B1=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scss/components/form/_input-group.scss | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/scss/components/form/_input-group.scss b/scss/components/form/_input-group.scss index 151785fe..cf76e47c 100644 --- a/scss/components/form/_input-group.scss +++ b/scss/components/form/_input-group.scss @@ -17,10 +17,8 @@ &-addOn { background: $InputGroup-addOn-bg; - border: $InputGroup-addOn-borderWidth solid - $InputGroup-addOn-borderColor; - line-height: $InputGroup-height - $InputGroup-paddingY * 2 - - $InputGroup-addOn-borderWidth * 2; + border: $InputGroup-addOn-borderWidth solid $InputGroup-addOn-borderColor; + line-height: $InputGroup-height - $InputGroup-paddingY * 2 - $InputGroup-addOn-borderWidth * 2; height: $InputGroup-height; box-sizing: border-box; padding: $InputGroup-paddingY $InputGroup-paddingX; @@ -47,8 +45,7 @@ &-btn { .#{$ns}Button { border-radius: 0; - border: $InputGroup-button-borderWidth solid - $InputGroup-button-borderColor; + border: $InputGroup-button-borderWidth solid $InputGroup-button-borderColor; } &:not(:last-child) .#{$ns}Button { @@ -73,6 +70,7 @@ .#{$ns}TextControl-input { flex-basis: 0; flex-grow: 1; + display: inline-flex; &:not(:first-child) { border-top-left-radius: 0; @@ -90,9 +88,7 @@ @if $InputGroup-select-borderWidth { .#{$ns}Select { background-color: $InputGroup-select-bg; - border: $InputGroup-select-borderWidth - solid - $InputGroup-select-borderColor; + border: $InputGroup-select-borderWidth solid $InputGroup-select-borderColor; @if $InputGroup-select-color !=$Form-select-color { color: $InputGroup-select-color; @@ -137,6 +133,7 @@ } &.is-focused { + .#{$ns}InputGroup-addOn, .#{$ns}TextControl-input, .#{$ns}Select, @@ -156,9 +153,7 @@ } } - @if $InputGroup-select-onFocused-arrowColor - !=$Form-select-caret-iconColor - { + @if $InputGroup-select-onFocused-arrowColor !=$Form-select-caret-iconColor { .#{$ns}Select-arrow { color: $InputGroup-select-onFocused-arrowColor; } @@ -172,4 +167,4 @@ .#{$ns}InputGroup:not(.is-inline) { display: flex; -} +} \ No newline at end of file