From ec9dabd06110aa05983c7a42bfe51a1dea002caa Mon Sep 17 00:00:00 2001 From: Giovanni Gonzaga Date: Tue, 3 Apr 2018 12:42:25 +0200 Subject: [PATCH 1/2] input border-width should be overridable --- src/Input/input.scss | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Input/input.scss b/src/Input/input.scss index b3b99f3cb..717a27086 100644 --- a/src/Input/input.scss +++ b/src/Input/input.scss @@ -4,8 +4,10 @@ $padding-h: 12px !default; $font-size: 14px !default; $font-weight: $brc-regular !default; $placeholder-color: $brc-coolGrey !default; +$placeholder-font-weight: $font-weight !default; $color: $brc-darkGrey !default; $border-color: $brc-silver !default; +$border-width: 1px !default; $color-focus: $brc-darkGrey !default; $border-color-focus: $brc-waterBlue !default; $opacity-disabled: .6 !default; @@ -16,7 +18,7 @@ $border-color-failure: $brc-alizarinCrimson !default; .input { input { - border: 1px solid $border-color; + border: $border-width solid $border-color; border-radius: 4px; height: $height; padding: 0 $padding-h; @@ -31,6 +33,7 @@ $border-color-failure: $brc-alizarinCrimson !default; &:-ms-input-placeholder, &:-moz-placeholder { color: $placeholder-color; + font-weight: $placeholder-font-weight; } &:disabled { @@ -39,7 +42,7 @@ $border-color-failure: $brc-alizarinCrimson !default; } &:focus { - border: 1px solid $border-color-focus; + border: $border-width solid $border-color-focus; outline: none; box-shadow: 0; color: $color-focus; @@ -49,6 +52,7 @@ $border-color-failure: $brc-alizarinCrimson !default; &:not(.has-value) { input { color: $placeholder-color; + font-weight: $placeholder-font-weight; } } @@ -63,7 +67,7 @@ $border-color-failure: $brc-alizarinCrimson !default; &.is-success { input { - border: 1px solid $border-color-success; + border: $border-width solid $border-color-success; color: $color-success; } @@ -74,7 +78,7 @@ $border-color-failure: $brc-alizarinCrimson !default; &.is-failure { input { - border: 1px solid $border-color-failure; + border: $border-width solid $border-color-failure; color: $color-failure; } From 71cffd173bf1eff8237b3229d1685a033eeb9bac Mon Sep 17 00:00:00 2001 From: Giovanni Gonzaga Date: Tue, 3 Apr 2018 13:05:52 +0200 Subject: [PATCH 2/2] input error/success should use the correct icons --- src/Input/Input.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Input/Input.tsx b/src/Input/Input.tsx index 3a45c70e4..713237aaa 100644 --- a/src/Input/Input.tsx +++ b/src/Input/Input.tsx @@ -69,8 +69,8 @@ export class Input extends React.PureComponent { const isSuccess = status === 'success'; const isFailure = status === 'failure'; const children = this.props.children || ( - isSuccess ? : - isFailure ? : + isSuccess ? : + isFailure ? : undefined );