From 76aef7710f709c5b0d3e710d4342ec92f8dd4169 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 12 Oct 2020 20:12:55 -0700 Subject: [PATCH] Better theme property naming. --- react/src/components/Widget/Widget.stories.tsx | 2 +- react/src/components/Widget/Widget.tsx | 8 ++++---- react/src/themes/Theme.ts | 2 +- react/src/themes/themes/orange.ts | 2 +- react/src/themes/themes/paybutton.ts | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/react/src/components/Widget/Widget.stories.tsx b/react/src/components/Widget/Widget.stories.tsx index c021f34f..43b530f4 100644 --- a/react/src/components/Widget/Widget.stories.tsx +++ b/react/src/components/Widget/Widget.stories.tsx @@ -52,7 +52,7 @@ CustomTheme.args = { palette: { primary: '#d05050', secondary: '#bee', - dark: '#084', + tertiary: '#084', logo: '#404', }, }, diff --git a/react/src/components/Widget/Widget.tsx b/react/src/components/Widget/Widget.tsx index 7fe30436..1cd7e35d 100644 --- a/react/src/components/Widget/Widget.tsx +++ b/react/src/components/Widget/Widget.tsx @@ -69,20 +69,20 @@ const useStyles = makeStyles({ copyText: ({ theme }: StyleProps) => ({ lineHeight: '1.2em', fontSize: '0.7em', - color: theme.palette.dark, + color: theme.palette.tertiary, textShadow: '#fff -2px 0 1px, #fff 0 -2px 1px, #fff 0 2px 1px, #fff 2px 0 1px', }), text: ({ theme }: StyleProps) => ({ fontSize: '0.9rem', - color: theme.palette.dark, + color: theme.palette.tertiary, }), spinner: ({ theme }: StyleProps) => ({ color: theme.palette.primary, }), footer: ({ theme }: StyleProps) => ({ fontSize: '0.6rem', - color: theme.palette.dark, + color: theme.palette.tertiary, }), }); @@ -148,7 +148,7 @@ export const Widget: React.FC = props => { size: 300, level: 'H', // High error correction allows for a larger logo value: url, - fgColor: theme.palette.dark, + fgColor: theme.palette.tertiary, imageSettings: { src: success ? checkSvg : bchSvg, excavate: false, diff --git a/react/src/themes/Theme.ts b/react/src/themes/Theme.ts index 8ff0508d..461a5dfa 100644 --- a/react/src/themes/Theme.ts +++ b/react/src/themes/Theme.ts @@ -2,7 +2,7 @@ export interface Theme { palette: { primary: string; secondary: string; - dark: string; + tertiary: string; logo: string; }; } diff --git a/react/src/themes/themes/orange.ts b/react/src/themes/themes/orange.ts index 204bbf8c..6acca062 100644 --- a/react/src/themes/themes/orange.ts +++ b/react/src/themes/themes/orange.ts @@ -6,7 +6,7 @@ const theme: Theme = { palette: { primary, secondary: '#fefbf8', - dark: '#504030', + tertiary: '#504030', logo: primary, }, }; diff --git a/react/src/themes/themes/paybutton.ts b/react/src/themes/themes/paybutton.ts index 08101f35..b7ac9d37 100644 --- a/react/src/themes/themes/paybutton.ts +++ b/react/src/themes/themes/paybutton.ts @@ -6,7 +6,7 @@ const theme: Theme = { palette: { primary, secondary: '#f8fdf8', - dark: '#374936', + tertiary: '#374936', logo: primary, }, };