diff --git a/ts/components/NoticeBanner.tsx b/ts/components/NoticeBanner.tsx index f91c496cb..06e567ccb 100644 --- a/ts/components/NoticeBanner.tsx +++ b/ts/components/NoticeBanner.tsx @@ -53,8 +53,7 @@ export const NoticeBanner = (props: NoticeBannerProps) => { const StyledGroupInviteBanner = styled(Flex)` position: relative; - background-color: var(--orange-color); - color: var(--black-color); + color: var(--warning-color); font-size: var(--font-size-sm); padding: var(--margins-xs) var(--margins-lg); text-align: center; @@ -62,8 +61,6 @@ const StyledGroupInviteBanner = styled(Flex)` // when part a a dialog, invert it and make it narrower (as the dialog grows to make it fit) ${StyledRootDialog} & { - background-color: unset; - color: var(--text-primary-color); max-width: 300px; } `; diff --git a/ts/themes/classicDark.ts b/ts/themes/classicDark.ts index fc776b56e..76f428695 100644 --- a/ts/themes/classicDark.ts +++ b/ts/themes/classicDark.ts @@ -4,6 +4,7 @@ import { ThemeColorVariables } from './variableColors'; export const classicDark: ThemeColorVariables = { '--danger-color': THEMES.CLASSIC_DARK.DANGER, + '--warning-color': THEMES.CLASSIC_DARK.WARNING, '--disabled-color': THEMES.CLASSIC_DARK.DISABLED, '--background-primary-color': THEMES.CLASSIC_DARK.COLOR1, diff --git a/ts/themes/classicLight.ts b/ts/themes/classicLight.ts index bc142fd30..7f318196c 100644 --- a/ts/themes/classicLight.ts +++ b/ts/themes/classicLight.ts @@ -4,6 +4,7 @@ import { ThemeColorVariables } from './variableColors'; export const classicLight: ThemeColorVariables = { '--danger-color': THEMES.CLASSIC_LIGHT.DANGER, + '--warning-color': THEMES.CLASSIC_LIGHT.WARNING, '--disabled-color': THEMES.CLASSIC_LIGHT.DISABLED, '--background-primary-color': THEMES.CLASSIC_LIGHT.COLOR6, diff --git a/ts/themes/constants/colors.tsx b/ts/themes/constants/colors.tsx index 5642ac766..81db5b2cf 100644 --- a/ts/themes/constants/colors.tsx +++ b/ts/themes/constants/colors.tsx @@ -119,6 +119,7 @@ export function convertThemeStateToName(themeState: string): ThemeNames { type ThemeColors = { PRIMARY: string; DANGER: string; + WARNING: string; DISABLED: string; COLOR0: string; COLOR1: string; @@ -134,6 +135,7 @@ type Themes = Record; // Classic Light const classicLightPrimary = primaryGreen; const classicLightDanger = dangerLight; +const classicLightWarning = '#A64B00'; const classicLightDisabled = disabledLight; const classicLight0 = '#000000'; const classicLight1 = '#6D6D6D'; @@ -146,6 +148,7 @@ const classicLight6 = '#FFFFFF'; // Classic Dark const classicDarkPrimary = primaryGreen; const classicDarkDanger = dangerDark; +const classicDarkWarning = '#FCB159'; const classicDarkDisabled = disabledDark; const classicDark0 = '#000000'; const classicDark1 = '#1B1B1B'; @@ -158,6 +161,7 @@ const classicDark6 = '#FFFFFF'; // Ocean Light const oceanLightPrimary = primaryBlue; const oceanLightDanger = dangerLight; +const oceanLightWarning = '#A64B00'; const oceanLightDisabled = disabledLight; const oceanLight0 = '#000000'; const oceanLight1 = '#19345D'; @@ -171,6 +175,7 @@ const oceanLight7 = '#FCFFFF'; // Ocean Dark const oceanDarkPrimary = primaryBlue; const oceanDarkDanger = dangerDark; +const oceanDarkWarning = '#FCB159'; const oceanDarkDisabled = disabledDark; const oceanDark0 = '#000000'; const oceanDark1 = '#1A1C28'; @@ -185,6 +190,7 @@ const THEMES: Themes = { CLASSIC_LIGHT: { PRIMARY: classicLightPrimary, DANGER: classicLightDanger, + WARNING: classicLightWarning, DISABLED: classicLightDisabled, COLOR0: classicLight0, COLOR1: classicLight1, @@ -196,6 +202,7 @@ const THEMES: Themes = { }, CLASSIC_DARK: { PRIMARY: classicDarkPrimary, + WARNING: classicDarkWarning, DANGER: classicDarkDanger, DISABLED: classicDarkDisabled, COLOR0: classicDark0, @@ -208,6 +215,7 @@ const THEMES: Themes = { }, OCEAN_LIGHT: { PRIMARY: oceanLightPrimary, + WARNING: oceanLightWarning, DANGER: oceanLightDanger, DISABLED: oceanLightDisabled, COLOR0: oceanLight0, @@ -221,6 +229,7 @@ const THEMES: Themes = { }, OCEAN_DARK: { PRIMARY: oceanDarkPrimary, + WARNING: oceanDarkWarning, DANGER: oceanDarkDanger, DISABLED: oceanDarkDisabled, COLOR0: oceanDark0, diff --git a/ts/themes/oceanDark.ts b/ts/themes/oceanDark.ts index f76e8bd3d..77765ddde 100644 --- a/ts/themes/oceanDark.ts +++ b/ts/themes/oceanDark.ts @@ -4,6 +4,7 @@ import { ThemeColorVariables } from './variableColors'; export const oceanDark: ThemeColorVariables = { '--danger-color': THEMES.OCEAN_DARK.DANGER, + '--warning-color': THEMES.OCEAN_DARK.WARNING, '--disabled-color': THEMES.OCEAN_DARK.DISABLED, '--background-primary-color': THEMES.OCEAN_DARK.COLOR1, diff --git a/ts/themes/oceanLight.ts b/ts/themes/oceanLight.ts index 8d41f4ed9..9121be4fa 100644 --- a/ts/themes/oceanLight.ts +++ b/ts/themes/oceanLight.ts @@ -4,6 +4,7 @@ import { ThemeColorVariables } from './variableColors'; export const oceanLight: ThemeColorVariables = { '--danger-color': THEMES.OCEAN_LIGHT.DANGER, + '--warning-color': THEMES.OCEAN_LIGHT.WARNING, '--disabled-color': THEMES.OCEAN_LIGHT.DISABLED, '--background-primary-color': THEMES.OCEAN_LIGHT.COLOR7!, diff --git a/ts/themes/variableColors.tsx b/ts/themes/variableColors.tsx index 5a9b3ac86..9d2392f24 100644 --- a/ts/themes/variableColors.tsx +++ b/ts/themes/variableColors.tsx @@ -1,6 +1,7 @@ // Default Theme should be Classic Dark export type ThemeColorVariables = { '--danger-color': string; + '--warning-color': string; '--disabled-color': string; /* Backgrounds */