From 9ce3926a1cdf726f87b3dccec9715a873779ef95 Mon Sep 17 00:00:00 2001 From: Sean Warren Date: Tue, 21 Nov 2023 13:16:25 -0800 Subject: [PATCH 1/7] feat: updated primary color to exabyte purple --- src/theme/palette/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/theme/palette/index.ts b/src/theme/palette/index.ts index 7100fc36..57f86b73 100644 --- a/src/theme/palette/index.ts +++ b/src/theme/palette/index.ts @@ -1,8 +1,8 @@ const palette = { primary: { - main: "#1056BE", // #3F2A98 - dark: "#0A3677", // #00114A - light: "#0A6EBD", // #533AC0 + main: "#3F2A98", // #3F2A98 + dark: "#00114A", // #00114A + light: "#533AC0", // #533AC0 contrastText: "#FFFFFF", }, secondary: { From 5631c552d86a6cf4952a94c7b35b178dba973a1b Mon Sep 17 00:00:00 2001 From: Sean Warren Date: Tue, 21 Nov 2023 13:30:00 -0800 Subject: [PATCH 2/7] feat: update exablue -> exapurple --- src/theme/components/buttons.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/theme/components/buttons.ts b/src/theme/components/buttons.ts index e4e1133d..13a80e15 100644 --- a/src/theme/components/buttons.ts +++ b/src/theme/components/buttons.ts @@ -24,12 +24,12 @@ const buttons = (theme: Theme) => { { props: { variant: "exablue-contained" }, style: { - backgroundColor: theme.palette.primary.dark, + backgroundColor: theme.palette.primary.main, color: "white", boxShadow: theme.shadows[2], "&:hover": { - backgroundColor: theme.palette.primary.dark, + backgroundColor: theme.palette.primary.light, boxShadow: theme.shadows[4], }, "&.Mui-disabled": { From 07fbd2832ab39588f2e6a8a286799b200086b7e6 Mon Sep 17 00:00:00 2001 From: Sean Warren Date: Tue, 21 Nov 2023 13:33:20 -0800 Subject: [PATCH 3/7] feat: update exablue -> exapurple --- src/theme/components/buttons.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/theme/components/buttons.ts b/src/theme/components/buttons.ts index 13a80e15..cdfc82cd 100644 --- a/src/theme/components/buttons.ts +++ b/src/theme/components/buttons.ts @@ -22,7 +22,7 @@ const buttons = (theme: Theme) => { }, }, { - props: { variant: "exablue-contained" }, + props: { variant: "exapurple-contained" }, style: { backgroundColor: theme.palette.primary.main, color: "white", From d75ded84c7221423b550d9f1656544d4b031e5b8 Mon Sep 17 00:00:00 2001 From: Sean Warren Date: Tue, 21 Nov 2023 14:19:00 -0800 Subject: [PATCH 4/7] feat: new custom button variant --- src/theme/components/buttons.ts | 16 ++++++++++++++-- src/theme/palette/index.ts | 6 +++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/theme/components/buttons.ts b/src/theme/components/buttons.ts index cdfc82cd..c76a4366 100644 --- a/src/theme/components/buttons.ts +++ b/src/theme/components/buttons.ts @@ -25,7 +25,7 @@ const buttons = (theme: Theme) => { props: { variant: "exapurple-contained" }, style: { backgroundColor: theme.palette.primary.main, - color: "white", + color: theme.palette.primary.contrastText, boxShadow: theme.shadows[2], "&:hover": { @@ -33,7 +33,19 @@ const buttons = (theme: Theme) => { boxShadow: theme.shadows[4], }, "&.Mui-disabled": { - color: theme.palette.primary.contrastText, + opacity: 0.8, + }, + }, + }, + { + props: { variant: "exapurple-text" }, + style: { + color: theme.palette.primary.main, + "&:hover": { + backgroundColor: "#3F2A9811", // exapurple-translucent + }, + "&.Mui-disabled": { + color: theme.palette.text.disabled, opacity: 0.8, }, }, diff --git a/src/theme/palette/index.ts b/src/theme/palette/index.ts index 57f86b73..d851fcc7 100644 --- a/src/theme/palette/index.ts +++ b/src/theme/palette/index.ts @@ -1,8 +1,8 @@ const palette = { primary: { - main: "#3F2A98", // #3F2A98 - dark: "#00114A", // #00114A - light: "#533AC0", // #533AC0 + main: "#3F2A98", + dark: "#00114A", + light: "#533AC0", contrastText: "#FFFFFF", }, secondary: { From 9beb3898eae9e12b2bc4dd459fbc97a82d31c666 Mon Sep 17 00:00:00 2001 From: Sean Warren Date: Tue, 21 Nov 2023 14:25:11 -0800 Subject: [PATCH 5/7] feat: changed hover color or text button variant --- src/theme/components/buttons.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/theme/components/buttons.ts b/src/theme/components/buttons.ts index c76a4366..c26fd4f6 100644 --- a/src/theme/components/buttons.ts +++ b/src/theme/components/buttons.ts @@ -43,6 +43,7 @@ const buttons = (theme: Theme) => { color: theme.palette.primary.main, "&:hover": { backgroundColor: "#3F2A9811", // exapurple-translucent + color: theme.palette.primary.main, }, "&.Mui-disabled": { color: theme.palette.text.disabled, From b25776fb0b8d071d0549f49de7601de4be7cad91 Mon Sep 17 00:00:00 2001 From: Sean Warren Date: Tue, 21 Nov 2023 16:57:41 -0800 Subject: [PATCH 6/7] chore: rename button variants --- src/theme/components/buttons.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/theme/components/buttons.ts b/src/theme/components/buttons.ts index c26fd4f6..4fc8c69e 100644 --- a/src/theme/components/buttons.ts +++ b/src/theme/components/buttons.ts @@ -22,7 +22,7 @@ const buttons = (theme: Theme) => { }, }, { - props: { variant: "exapurple-contained" }, + props: { variant: "primary-contained" }, style: { backgroundColor: theme.palette.primary.main, color: theme.palette.primary.contrastText, @@ -38,7 +38,7 @@ const buttons = (theme: Theme) => { }, }, { - props: { variant: "exapurple-text" }, + props: { variant: "primary-text" }, style: { color: theme.palette.primary.main, "&:hover": { From 0934657b653b4dfd735ba6334aba96c73059ee96 Mon Sep 17 00:00:00 2001 From: Sean Warren Date: Mon, 27 Nov 2023 18:20:26 -0800 Subject: [PATCH 7/7] chore: cleanup button variants --- src/theme/components/buttons.ts | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/src/theme/components/buttons.ts b/src/theme/components/buttons.ts index 4fc8c69e..fa3c9143 100644 --- a/src/theme/components/buttons.ts +++ b/src/theme/components/buttons.ts @@ -21,36 +21,6 @@ const buttons = (theme: Theme) => { fontSize: "13px", }, }, - { - props: { variant: "primary-contained" }, - style: { - backgroundColor: theme.palette.primary.main, - color: theme.palette.primary.contrastText, - boxShadow: theme.shadows[2], - - "&:hover": { - backgroundColor: theme.palette.primary.light, - boxShadow: theme.shadows[4], - }, - "&.Mui-disabled": { - opacity: 0.8, - }, - }, - }, - { - props: { variant: "primary-text" }, - style: { - color: theme.palette.primary.main, - "&:hover": { - backgroundColor: "#3F2A9811", // exapurple-translucent - color: theme.palette.primary.main, - }, - "&.Mui-disabled": { - color: theme.palette.text.disabled, - opacity: 0.8, - }, - }, - }, { props: { variant: "selected" }, style: {