From 9b69659afd3124b779620ac0db25ee6edabec978 Mon Sep 17 00:00:00 2001 From: Daniel Hochman Date: Fri, 4 Dec 2020 14:02:49 -0600 Subject: [PATCH 1/3] button style updatse --- frontend/packages/core/src/button.tsx | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/frontend/packages/core/src/button.tsx b/frontend/packages/core/src/button.tsx index 5dd208ac7f..09e09bd04d 100644 --- a/frontend/packages/core/src/button.tsx +++ b/frontend/packages/core/src/button.tsx @@ -18,8 +18,8 @@ const COLORS = { primary: { background: { primary: "#3548D4", - hover: "#7680E8", - active: "#1B31C6", + hover: "#2D3DB4", + active: "#2938A5", disabled: "#7680E8", }, font: "#FFFFFF", @@ -27,9 +27,9 @@ const COLORS = { danger: { background: { primary: "#DB3615", - hover: "#FF6441", - active: "#E32E11", - disabled: "#FF3E1C", + hover: "#BA2E12", + active: "#AB2A10", + disabled: "#F1B3A6", }, font: "#FFFFFF", }, @@ -38,9 +38,12 @@ const COLORS = { const StyledButton = styled(MuiButton)( { borderRadius: "4px", - fontWeight: 700, + fontWeight: 500, + lineHeight: "20px", + fontSize: "16px", textTransform: "none", - padding: "0.875rem 2rem", + height: "48px", + padding: "14px 32px", margin: "2rem .875rem", }, props => ({ @@ -62,6 +65,9 @@ const StyledButton = styled(MuiButton)( const OutlinedButton = styled(StyledButton)({ border: "1px solid #0D1030", + "&.Mui-disabled": { + borderColor: "rgba(13, 16, 48, 0.1)", + }, }); export interface ButtonProps From 79e42adc23976fae6c7dba361c44320e2006d2d9 Mon Sep 17 00:00:00 2001 From: Daniel Hochman Date: Fri, 4 Dec 2020 15:58:02 -0600 Subject: [PATCH 2/3] Update frontend/packages/core/src/button.tsx Co-authored-by: Scarlett Perry <39421794+scarlettperry@users.noreply.github.com> --- frontend/packages/core/src/button.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/packages/core/src/button.tsx b/frontend/packages/core/src/button.tsx index 09e09bd04d..f51d39829b 100644 --- a/frontend/packages/core/src/button.tsx +++ b/frontend/packages/core/src/button.tsx @@ -20,7 +20,7 @@ const COLORS = { primary: "#3548D4", hover: "#2D3DB4", active: "#2938A5", - disabled: "#7680E8", + disabled: "#E7E7EA", }, font: "#FFFFFF", }, From 00f26c0c51f1dd8d9803c203514956f208808f30 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 4 Dec 2020 14:28:55 -0800 Subject: [PATCH 3/3] Update button.tsx --- frontend/packages/core/src/button.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/packages/core/src/button.tsx b/frontend/packages/core/src/button.tsx index f51d39829b..9ff0ebcff9 100644 --- a/frontend/packages/core/src/button.tsx +++ b/frontend/packages/core/src/button.tsx @@ -9,7 +9,7 @@ const COLORS = { neutral: { background: { primary: "#FFFFFF", - hover: "#EFF0F2", + hover: "#E7E7EA", active: "#CFD3D7", disabled: "#FFFFFF", },