diff --git a/src/Button/styled.js b/src/Button/styled.js index 4fc7a2155..275bc81d0 100644 --- a/src/Button/styled.js +++ b/src/Button/styled.js @@ -42,12 +42,12 @@ const linkProperties = css` border: 0; background: unset; box-shadow: unset !important; - color: ${props => (props.palette === 'default' ? palette('text')(props) : palette()(props) || '')}; + color: ${props => (props.palette === 'default' ? palette('text')(props) : palette()(props))}; text-decoration: underline; &:hover { color: ${props => - props.palette === 'default' ? darken(0.5, palette('text')(props)) : darken(0.5, palette()(props) || '')}; + props.palette === 'default' ? darken(0.5, palette('text')(props)) : darken(0.5, palette()(props))}; } } & { @@ -83,10 +83,10 @@ const disabledProperties = css` const interactiveProperties = css` &:hover { - background-color: ${props => darken(0.05, palette()(props) || '')}; + background-color: ${props => darken(0.05, palette()(props))}; } &:hover:active { - background-color: ${props => darken(0.1, palette()(props) || '')}; + background-color: ${props => darken(0.1, palette()(props))}; } `; const loadingProperties = css` @@ -105,7 +105,7 @@ const loadingProperties = css` export default styled(Button)` align-items: center; background-color: ${palette()}; - border: 1px solid ${props => darken(0.2, palette()(props) || '')}; + border: 1px solid ${props => darken(0.2, palette()(props))}; border-radius: 4px; color: ${props => palette(`${props.palette}Inverted`)(props)}; cursor: pointer; diff --git a/src/themes/default.js b/src/themes/default.js index ae75289fe..e1446e778 100644 --- a/src/themes/default.js +++ b/src/themes/default.js @@ -4,6 +4,7 @@ import { palette as p, theme } from 'styled-tools'; import type { ThemeConfig } from '../types'; export default (overrides: ThemeConfig = {}): ThemeConfig => ({ + ...overrides, palette: { text: '#435a6f', @@ -90,6 +91,5 @@ export default (overrides: ThemeConfig = {}): ThemeConfig => ({ }, spacing: theme('layout.spacing.xxsmall'), ...overrides.Table - }, - ...overrides + } });