diff --git a/frontend/ee b/frontend/ee index f435f12b1f..335435aa74 160000 --- a/frontend/ee +++ b/frontend/ee @@ -1 +1 @@ -Subproject commit f435f12b1f4dc92f95b070e41b4b307d71e39419 +Subproject commit 335435aa74f8d56997978d7e6343023ee2726f81 diff --git a/server/src/modules/organization-themes/constants/index.ts b/server/src/modules/organization-themes/constants/index.ts index 3b6a4687e5..581c2181c0 100644 --- a/server/src/modules/organization-themes/constants/index.ts +++ b/server/src/modules/organization-themes/constants/index.ts @@ -31,11 +31,11 @@ export const TJDefaultTheme: Definition = { light: '#1B1F24', dark: '#CFD3D8', }, - secondary: { + placeholder: { light: '#6A727C', dark: '#858C94', }, - tertiary: { + disabled: { light: '#ACB2B9', dark: '#545B64', }, @@ -48,15 +48,15 @@ export const TJDefaultTheme: Definition = { large: 0, }, colors: { - primary: { + default: { light: '#CCD1D5', dark: '#3C434B', }, - secondary: { + weak: { light: '#E4E7EB', dark: '#EEF0F1', }, - tertiary: { + disabled: { light: '#E4E7EB', dark: '#F6F8FA', }, @@ -64,15 +64,15 @@ export const TJDefaultTheme: Definition = { }, systemStatus: { colors: { - primary: { + success: { light: '#1E823B', dark: '#318344', }, - secondary: { + error: { light: '#D72D39', dark: '#D03F43', }, - tertiary: { + warning: { light: '#BF4F03', dark: '#BA5722', }, diff --git a/server/src/modules/organization-themes/dto/index.ts b/server/src/modules/organization-themes/dto/index.ts index 24a51106d5..eb7ac608cd 100644 --- a/server/src/modules/organization-themes/dto/index.ts +++ b/server/src/modules/organization-themes/dto/index.ts @@ -33,12 +33,12 @@ class TextColors { @IsOptional() @ValidateNested() @Type(() => Color) - secondary?: Color; + placeholder?: Color; @IsOptional() @ValidateNested() @Type(() => Color) - tertiary?: Color; + disabled?: Color; } class Text { @@ -64,17 +64,17 @@ class BorderRadius { class BorderColors { @ValidateNested() @Type(() => Color) - primary: Color; + default: Color; @IsOptional() @ValidateNested() @Type(() => Color) - secondary?: Color; + weak?: Color; @IsOptional() @ValidateNested() @Type(() => Color) - tertiary?: Color; + disabled?: Color; } class Border { @@ -90,17 +90,17 @@ class Border { class SystemStatusColors { @ValidateNested() @Type(() => Color) - primary: Color; + success: Color; @IsOptional() @ValidateNested() @Type(() => Color) - secondary?: Color; + error?: Color; @IsOptional() @ValidateNested() @Type(() => Color) - tertiary?: Color; + warning?: Color; } class SystemStatus {