fix: add warning colours per theme and use them

pull/3281/head
Audric Ackermann 4 months ago
parent 7a4c0a0377
commit f0141b5894
No known key found for this signature in database

@ -53,8 +53,7 @@ export const NoticeBanner = (props: NoticeBannerProps) => {
const StyledGroupInviteBanner = styled(Flex)` const StyledGroupInviteBanner = styled(Flex)`
position: relative; position: relative;
background-color: var(--orange-color); color: var(--warning-color);
color: var(--black-color);
font-size: var(--font-size-sm); font-size: var(--font-size-sm);
padding: var(--margins-xs) var(--margins-lg); padding: var(--margins-xs) var(--margins-lg);
text-align: center; 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) // when part a a dialog, invert it and make it narrower (as the dialog grows to make it fit)
${StyledRootDialog} & { ${StyledRootDialog} & {
background-color: unset;
color: var(--text-primary-color);
max-width: 300px; max-width: 300px;
} }
`; `;

@ -4,6 +4,7 @@ import { ThemeColorVariables } from './variableColors';
export const classicDark: ThemeColorVariables = { export const classicDark: ThemeColorVariables = {
'--danger-color': THEMES.CLASSIC_DARK.DANGER, '--danger-color': THEMES.CLASSIC_DARK.DANGER,
'--warning-color': THEMES.CLASSIC_DARK.WARNING,
'--disabled-color': THEMES.CLASSIC_DARK.DISABLED, '--disabled-color': THEMES.CLASSIC_DARK.DISABLED,
'--background-primary-color': THEMES.CLASSIC_DARK.COLOR1, '--background-primary-color': THEMES.CLASSIC_DARK.COLOR1,

@ -4,6 +4,7 @@ import { ThemeColorVariables } from './variableColors';
export const classicLight: ThemeColorVariables = { export const classicLight: ThemeColorVariables = {
'--danger-color': THEMES.CLASSIC_LIGHT.DANGER, '--danger-color': THEMES.CLASSIC_LIGHT.DANGER,
'--warning-color': THEMES.CLASSIC_LIGHT.WARNING,
'--disabled-color': THEMES.CLASSIC_LIGHT.DISABLED, '--disabled-color': THEMES.CLASSIC_LIGHT.DISABLED,
'--background-primary-color': THEMES.CLASSIC_LIGHT.COLOR6, '--background-primary-color': THEMES.CLASSIC_LIGHT.COLOR6,

@ -119,6 +119,7 @@ export function convertThemeStateToName(themeState: string): ThemeNames {
type ThemeColors = { type ThemeColors = {
PRIMARY: string; PRIMARY: string;
DANGER: string; DANGER: string;
WARNING: string;
DISABLED: string; DISABLED: string;
COLOR0: string; COLOR0: string;
COLOR1: string; COLOR1: string;
@ -134,6 +135,7 @@ type Themes = Record<ThemeNames, ThemeColors>;
// Classic Light // Classic Light
const classicLightPrimary = primaryGreen; const classicLightPrimary = primaryGreen;
const classicLightDanger = dangerLight; const classicLightDanger = dangerLight;
const classicLightWarning = '#A64B00';
const classicLightDisabled = disabledLight; const classicLightDisabled = disabledLight;
const classicLight0 = '#000000'; const classicLight0 = '#000000';
const classicLight1 = '#6D6D6D'; const classicLight1 = '#6D6D6D';
@ -146,6 +148,7 @@ const classicLight6 = '#FFFFFF';
// Classic Dark // Classic Dark
const classicDarkPrimary = primaryGreen; const classicDarkPrimary = primaryGreen;
const classicDarkDanger = dangerDark; const classicDarkDanger = dangerDark;
const classicDarkWarning = '#FCB159';
const classicDarkDisabled = disabledDark; const classicDarkDisabled = disabledDark;
const classicDark0 = '#000000'; const classicDark0 = '#000000';
const classicDark1 = '#1B1B1B'; const classicDark1 = '#1B1B1B';
@ -158,6 +161,7 @@ const classicDark6 = '#FFFFFF';
// Ocean Light // Ocean Light
const oceanLightPrimary = primaryBlue; const oceanLightPrimary = primaryBlue;
const oceanLightDanger = dangerLight; const oceanLightDanger = dangerLight;
const oceanLightWarning = '#A64B00';
const oceanLightDisabled = disabledLight; const oceanLightDisabled = disabledLight;
const oceanLight0 = '#000000'; const oceanLight0 = '#000000';
const oceanLight1 = '#19345D'; const oceanLight1 = '#19345D';
@ -171,6 +175,7 @@ const oceanLight7 = '#FCFFFF';
// Ocean Dark // Ocean Dark
const oceanDarkPrimary = primaryBlue; const oceanDarkPrimary = primaryBlue;
const oceanDarkDanger = dangerDark; const oceanDarkDanger = dangerDark;
const oceanDarkWarning = '#FCB159';
const oceanDarkDisabled = disabledDark; const oceanDarkDisabled = disabledDark;
const oceanDark0 = '#000000'; const oceanDark0 = '#000000';
const oceanDark1 = '#1A1C28'; const oceanDark1 = '#1A1C28';
@ -185,6 +190,7 @@ const THEMES: Themes = {
CLASSIC_LIGHT: { CLASSIC_LIGHT: {
PRIMARY: classicLightPrimary, PRIMARY: classicLightPrimary,
DANGER: classicLightDanger, DANGER: classicLightDanger,
WARNING: classicLightWarning,
DISABLED: classicLightDisabled, DISABLED: classicLightDisabled,
COLOR0: classicLight0, COLOR0: classicLight0,
COLOR1: classicLight1, COLOR1: classicLight1,
@ -196,6 +202,7 @@ const THEMES: Themes = {
}, },
CLASSIC_DARK: { CLASSIC_DARK: {
PRIMARY: classicDarkPrimary, PRIMARY: classicDarkPrimary,
WARNING: classicDarkWarning,
DANGER: classicDarkDanger, DANGER: classicDarkDanger,
DISABLED: classicDarkDisabled, DISABLED: classicDarkDisabled,
COLOR0: classicDark0, COLOR0: classicDark0,
@ -208,6 +215,7 @@ const THEMES: Themes = {
}, },
OCEAN_LIGHT: { OCEAN_LIGHT: {
PRIMARY: oceanLightPrimary, PRIMARY: oceanLightPrimary,
WARNING: oceanLightWarning,
DANGER: oceanLightDanger, DANGER: oceanLightDanger,
DISABLED: oceanLightDisabled, DISABLED: oceanLightDisabled,
COLOR0: oceanLight0, COLOR0: oceanLight0,
@ -221,6 +229,7 @@ const THEMES: Themes = {
}, },
OCEAN_DARK: { OCEAN_DARK: {
PRIMARY: oceanDarkPrimary, PRIMARY: oceanDarkPrimary,
WARNING: oceanDarkWarning,
DANGER: oceanDarkDanger, DANGER: oceanDarkDanger,
DISABLED: oceanDarkDisabled, DISABLED: oceanDarkDisabled,
COLOR0: oceanDark0, COLOR0: oceanDark0,

@ -4,6 +4,7 @@ import { ThemeColorVariables } from './variableColors';
export const oceanDark: ThemeColorVariables = { export const oceanDark: ThemeColorVariables = {
'--danger-color': THEMES.OCEAN_DARK.DANGER, '--danger-color': THEMES.OCEAN_DARK.DANGER,
'--warning-color': THEMES.OCEAN_DARK.WARNING,
'--disabled-color': THEMES.OCEAN_DARK.DISABLED, '--disabled-color': THEMES.OCEAN_DARK.DISABLED,
'--background-primary-color': THEMES.OCEAN_DARK.COLOR1, '--background-primary-color': THEMES.OCEAN_DARK.COLOR1,

@ -4,6 +4,7 @@ import { ThemeColorVariables } from './variableColors';
export const oceanLight: ThemeColorVariables = { export const oceanLight: ThemeColorVariables = {
'--danger-color': THEMES.OCEAN_LIGHT.DANGER, '--danger-color': THEMES.OCEAN_LIGHT.DANGER,
'--warning-color': THEMES.OCEAN_LIGHT.WARNING,
'--disabled-color': THEMES.OCEAN_LIGHT.DISABLED, '--disabled-color': THEMES.OCEAN_LIGHT.DISABLED,
'--background-primary-color': THEMES.OCEAN_LIGHT.COLOR7!, '--background-primary-color': THEMES.OCEAN_LIGHT.COLOR7!,

@ -1,6 +1,7 @@
// Default Theme should be Classic Dark // Default Theme should be Classic Dark
export type ThemeColorVariables = { export type ThemeColorVariables = {
'--danger-color': string; '--danger-color': string;
'--warning-color': string;
'--disabled-color': string; '--disabled-color': string;
/* Backgrounds */ /* Backgrounds */

Loading…
Cancel
Save