From 7b5eb32d00565545aa6ce2833195094ccbdb2224 Mon Sep 17 00:00:00 2001 From: Alex Windett Date: Thu, 2 Feb 2017 15:58:36 +0000 Subject: [PATCH] updating more names in small components --- ui/src/components/form/label.js | 2 +- ui/src/components/form/outlet.js | 8 ++++---- ui/src/components/icon/index.js | 8 +++++--- ui/src/components/icon/style.css | 3 --- 4 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 ui/src/components/icon/style.css diff --git a/ui/src/components/form/label.js b/ui/src/components/form/label.js index ce0ead13..96225ffc 100644 --- a/ui/src/components/form/label.js +++ b/ui/src/components/form/label.js @@ -20,5 +20,5 @@ module.exports = styled.label` font-weight: 600; font-style: normal; font-stretch: normal; - color: ${colors.brandSecondaryColor}; + color: ${colors.base.secondary}; `; diff --git a/ui/src/components/form/outlet.js b/ui/src/components/form/outlet.js index 53048999..63dcfdbb 100644 --- a/ui/src/components/form/outlet.js +++ b/ui/src/components/form/outlet.js @@ -16,11 +16,11 @@ const { } = Styled; const colorWithDisabled = (props) => props.disabled - ? colors.brandInactiveColor + ? colors.inactive.default : colors.fonts.regular; const colorWithDefaultValue = (props) => props.value === props.defaultValue - ? colors.brandInactiveColor + ? colors.inactive.default : colorWithDisabled(props); const color = (props) => props.defaultValue @@ -46,7 +46,7 @@ module.exports = css` padding: ${paddingTop} ${remcalc(18)}; border-radius: ${boxes.borderRadius}; - background-color: ${colors.brandPrimaryColor}; + background-color: ${colors.base.primary}; box-shadow: ${boxes.insetShaddow}; border: ${boxes.border.unchecked}; @@ -61,7 +61,7 @@ module.exports = css` outline: 0; &:focus { - border-color: ${colors.brandPrimary}; + border-color: ${colors.base.primary}; outline: 0; } `; diff --git a/ui/src/components/icon/index.js b/ui/src/components/icon/index.js index 5217e27b..92e4a6a8 100644 --- a/ui/src/components/icon/index.js +++ b/ui/src/components/icon/index.js @@ -8,19 +8,21 @@ const { const styles = css` font-size: inherit; + + ${props => props.style} `; const Icon = ({ name = 'beer', className, iconSet = 'fa', - style + style = '', }) => { const Icon = require(`react-icons/lib/${iconSet}/${name}`); const Component = styled(Icon)(styles); return ( - + ); }; @@ -28,7 +30,7 @@ Icon.propTypes = { className: React.PropTypes.string, iconSet: React.PropTypes.string.isRequired, name: React.PropTypes.string.isRequired, - style: React.PropTypes.object + style: React.PropTypes.string, }; module.exports = Icon; diff --git a/ui/src/components/icon/style.css b/ui/src/components/icon/style.css deleted file mode 100644 index 86e66eb4..00000000 --- a/ui/src/components/icon/style.css +++ /dev/null @@ -1,3 +0,0 @@ -.icon { - font-size: inherit; -}