From 9dc55b91f441ea501de2fc24318c7cc75ea10154 Mon Sep 17 00:00:00 2001 From: meriadec Date: Thu, 19 Apr 2018 17:34:23 +0200 Subject: [PATCH] Put back correct style on buttons --- src/components/base/Button/index.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/base/Button/index.js b/src/components/base/Button/index.js index 1f2255b0..990220a9 100644 --- a/src/components/base/Button/index.js +++ b/src/components/base/Button/index.js @@ -12,27 +12,27 @@ import fontFamily from 'styles/styled/fontFamily' const buttonStyles = { primary: { default: p => ` - background: ${p.disabled ? p.theme.colors.lightFog : p.theme.colors.wallet}; + background: ${p.disabled ? `${p.theme.colors.lightFog} !important` : p.theme.colors.wallet}; color: ${p.disabled ? p.theme.colors.grey : p.theme.colors.white}; `, hover: p => ` - background: ${darken(p.theme.colors.wallet, 0.05)}; - `, + background: ${lighten(p.theme.colors.wallet, 0.05)}; + `, active: p => ` - background: ${darken(p.theme.colors.wallet, 0.05)}; - `, + background: ${darken(p.theme.colors.wallet, 0.1)}; + `, }, danger: { default: p => ` - background: ${p.disabled ? p.theme.colors.lightFog : p.theme.colors.alertRed}; + background: ${p.disabled ? `${p.theme.colors.lightFog} !important` : p.theme.colors.alertRed}; color: ${p.disabled ? p.theme.colors.grey : p.theme.colors.white}; `, hover: p => ` - background: ${lighten(p.theme.colors.alertRed, 0.2)}; - `, + background: ${lighten(p.theme.colors.alertRed, 0.1)}; + `, active: p => ` - background: ${lighten(p.theme.colors.alertRed, 0.2)}; - `, + background: ${darken(p.theme.colors.alertRed, 0.1)}; + `, }, outline: { default: p => ` @@ -87,8 +87,8 @@ const Base = styled.button.attrs({ outline: none; ${p => getStyles(p, 'default')}; - &:hover, - &:focus { + + &:hover { ${p => getStyles(p, 'hover')}; } &:active {