From 65cb289ebf8d2fea14e60e31aee1bdf30f95995e Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Wed, 26 Sep 2018 16:53:40 +0200 Subject: [PATCH] Adjust input color and height --- src/components/inputs/Input/index.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/inputs/Input/index.js b/src/components/inputs/Input/index.js index 407ff1cb..525fd2bc 100644 --- a/src/components/inputs/Input/index.js +++ b/src/components/inputs/Input/index.js @@ -7,6 +7,7 @@ import Icon from 'components/Icon'; import { FONT_SIZE, FONT_WEIGHT, + FONT_FAMILY, TRANSITION, } from 'config/variables'; @@ -28,18 +29,19 @@ const InputIconWrapper = styled.div` `; const TopLabel = styled.span` - padding-bottom: 4px; + padding-bottom: 10px; color: ${colors.TEXT_SECONDARY}; `; const StyledInput = styled.input` width: 100%; + height: 40px; padding: 6px ${props => (props.hasIcon ? '40px' : '12px')} 6px 12px; line-height: 1.42857143; font-size: ${FONT_SIZE.SMALL}; font-weight: ${FONT_WEIGHT.BASE}; - color: ${colors.TEXT_PRIMARY}; + color: ${props => (props.color ? props.color : colors.TEXT_SECONDARY)}; border-radius: 2px; ${props => props.hasAddon && css` @@ -61,6 +63,7 @@ const StyledInput = styled.input` const StyledIcon = styled(Icon)` position: absolute; left: auto; + top: 3px; right: 10px; `; @@ -116,6 +119,7 @@ class Input extends Component { innerRef={this.props.innerRef} hasAddon={!!this.props.sideAddons} type={this.props.type} + color={this.getColor(this.props.state)} placeholder={this.props.placeholder} autoComplete={this.props.autoComplete} autoCorrect={this.props.autoCorrect}