diff --git a/apps/scandic-web/components/ContentType/CampaignPage/Hero/hero.module.css b/apps/scandic-web/components/ContentType/CampaignPage/Hero/hero.module.css index 028c85e15..bed1cd1e0 100644 --- a/apps/scandic-web/components/ContentType/CampaignPage/Hero/hero.module.css +++ b/apps/scandic-web/components/ContentType/CampaignPage/Hero/hero.module.css @@ -27,7 +27,7 @@ gap: var(--Space-x1); } -.peach { +.theme-accent { .content { background-color: var(--Surface-Brand-Accent-Default); } @@ -39,16 +39,13 @@ } .text, - .campaignText { - color: var(--Text-Brand-OnPrimary-1-Default); - } - + .campaignText, .benefitList > li { - color: var(--Surface-Brand-Primary-1-OnSurface-Accent-Secondary); + color: var(--Text-Brand-OnAccent-Default); } } -.burgundy { +.theme-primary-3 { .content { background-color: var(--Surface-Brand-Primary-3-Default); } diff --git a/apps/scandic-web/components/ContentType/CampaignPage/Hero/index.tsx b/apps/scandic-web/components/ContentType/CampaignPage/Hero/index.tsx index 409a95c91..caf8a9f11 100644 --- a/apps/scandic-web/components/ContentType/CampaignPage/Hero/index.tsx +++ b/apps/scandic-web/components/ContentType/CampaignPage/Hero/index.tsx @@ -101,7 +101,7 @@ export default async function CampaignHero({ ) : null} ["theme"], hotelTheme: Theme | null = Theme.scandic ): ButtonVariants["color"] { - let buttonColor: ButtonVariants["color"] = "Inverted" + let buttonColor: ButtonVariants["color"] = "Primary" switch (hotelTheme) { case Theme.scandic: - if (heroTheme === "Peach") { - buttonColor = "Primary" - } - break - case Theme.scandicGo: - buttonColor = "Primary" - break - case Theme.grandHotel: - buttonColor = "Primary" - break case Theme.hotelNorge: - if (heroTheme === "Peach") { - buttonColor = "Primary" - } - break case Theme.theDock: - if (heroTheme === "Peach") { - buttonColor = "Primary" + if (heroTheme === "Primary 3") { + buttonColor = "Inverted" } break + case Theme.marski: case Theme.downtownCamper: case Theme.haymarket: - case Theme.marski: - case Theme.bassinSeven: - buttonColor = "Primary" + buttonColor = "Inverted" break + case Theme.bassinSeven: + case Theme.grandHotel: + case Theme.scandicGo: default: break } diff --git a/apps/scandic-web/components/ContentType/CampaignPage/Hero/variants.ts b/apps/scandic-web/components/ContentType/CampaignPage/Hero/variants.ts index ce584a87f..0d4994179 100644 --- a/apps/scandic-web/components/ContentType/CampaignPage/Hero/variants.ts +++ b/apps/scandic-web/components/ContentType/CampaignPage/Hero/variants.ts @@ -5,12 +5,12 @@ import styles from "./hero.module.css" const config = { variants: { theme: { - Peach: styles.peach, - Burgundy: styles.burgundy, + Accent: styles["theme-accent"], + "Primary 3": styles["theme-primary-3"], }, }, defaultVariants: { - theme: "Burgundy", + theme: "Primary 3", }, } as const diff --git a/packages/trpc/lib/routers/contentstack/campaignPage/output.ts b/packages/trpc/lib/routers/contentstack/campaignPage/output.ts index 7d3c955ec..b28442a85 100644 --- a/packages/trpc/lib/routers/contentstack/campaignPage/output.ts +++ b/packages/trpc/lib/routers/contentstack/campaignPage/output.ts @@ -58,7 +58,18 @@ export const blocksSchema = z.discriminatedUnion("__typename", [ export const heroSchema = z.object({ image: transformedImageVaultAssetSchema, heading: z.string(), - theme: z.enum(["Peach", "Burgundy"]).default("Peach"), + theme: z + .enum(["Peach", "Burgundy"]) + .nullish() + .transform((theme) => { + switch (theme) { + case "Burgundy": + return "Primary 3" + case "Peach": + default: + return "Accent" + } + }), benefits: z .array(z.string()) .nullish()