diff --git a/components/Icons/CheckCircle.tsx b/components/Icons/CheckCircle.tsx index 0826882ca..432f4ad68 100644 --- a/components/Icons/CheckCircle.tsx +++ b/components/Icons/CheckCircle.tsx @@ -2,7 +2,7 @@ import Image from "@/components/Image" import type { IconProps } from "@/types/components/icon" -export default function ChevronDownIcon({ +export default function CheckCircleIcon({ height = 20, width = 20, }: IconProps) { diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/index.tsx b/components/Loyalty/Blocks/DynamicContent/OverviewTable/index.tsx index cce0ea67e..bd81990f9 100644 --- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/index.tsx +++ b/components/Loyalty/Blocks/DynamicContent/OverviewTable/index.tsx @@ -60,13 +60,7 @@ type OverviewTableTitleProps = { texts: TitleTranslation[] } function OverviewTableTitle({ texts }: OverviewTableTitleProps) { return ( - + <Title as="h1" level="h1" weight="semiBold" uppercase> {texts.map(({ text, highlight }, idx) => ( <> <span key={idx} className={highlight ? styles.highlight : ""}> @@ -145,8 +139,8 @@ export default function OverviewTable() { return ( <div className={styles.container}> - <OverviewTableTitle texts={titleTranslations[Lang.en]} /> - <div> + <div className={styles.intro}> + <OverviewTableTitle texts={titleTranslations[Lang.en]} /> <p className={styles.preamble}> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Arcu risus diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/overviewTable.module.css b/components/Loyalty/Blocks/DynamicContent/OverviewTable/overviewTable.module.css index d017407b0..b4f684292 100644 --- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/overviewTable.module.css +++ b/components/Loyalty/Blocks/DynamicContent/OverviewTable/overviewTable.module.css @@ -1,18 +1,23 @@ .container { background-color: var(--Main-Brand-PalePeach); left: 50%; - margin-top: -1.6rem; + margin-top: calc(var(--Spacing-x2) * -1); margin-left: -50vw; margin-right: -50vw; - margin-bottom: -9.3rem; /* Based on the MaxWidth's 1.6rem + the LoyaltyPage's 7.7rem bottom margins */ + margin-bottom: calc( + (var(--Spacing-x2) + 7.7rem) * -1 + ); /* Based on the MaxWidth's 1.6rem + the LoyaltyPage's 7.7rem bottom margins */ position: relative; right: 50%; width: 100dvw; - padding: 1.6rem; + padding: var(--Spacing-x2); + display: grid; + gap: var(--Spacing-x6); } -.title { - font-family: var(--typography-Title1-Desktop-fontFamily), inherit; +.intro { + display: grid; + gap: var(--Spacing-x3); } .highlight { @@ -22,29 +27,29 @@ .preamble { color: var(--Base-Text-Primary-High-contrast); font-size: var(--typography-Body-Regular-fontSize); - line-height: 150%; + line-height: var(--typography-Body-Regular-lineHeight); margin: 0; } .columns { display: flex; flex-direction: column; - gap: 1.6rem; - padding: 1.6rem; + gap: var(--Spacing-x2); + padding-top: var(--Spacing-x2); position: relative; } .columnHeaderContainer { display: grid; grid-template-columns: 1fr 1fr; - gap: 1.6rem; + gap: var(--Spacing-x2); z-index: 2; } .columnHeader { display: flex; flex-direction: column; - gap: 1.6rem; + gap: var(--Spacing-x2); } .selectContainer { @@ -56,14 +61,14 @@ color: var(--Base-Text-UI-Placeholder); position: absolute; top: 7px; - left: 1.6rem; + left: var(--Spacing-x2); } .select { appearance: none; border: 1px solid var(--Base-Input-Controls-Border-Normal, #b8a79a); - border-radius: 0.8rem; - padding: 1.6rem; + border-radius: var(--Corner-radius-Medium); + padding: var(--Spacing-x2); width: 100%; } @@ -71,8 +76,8 @@ display: flex; align-items: center; position: absolute; - right: 1.6rem; - bottom: 1.6rem; + right: var(--Spacing-x2); + bottom: var(--Spacing-x2); } .leftColumn { @@ -82,6 +87,7 @@ bottom: 0; left: 0; right: 50%; + margin-left: calc(var(--Spacing-x2) * -1); z-index: 1; } @@ -90,40 +96,41 @@ position: absolute; position: absolute; top: 0; - bottom: 1.6rem; + bottom: var(--Spacing-x2); left: 50%; right: 0; + margin-right: calc(var(--Spacing-x2) * -1); z-index: 1; - border-top-left-radius: 0.8rem; + border-top-left-radius: var(--Corner-radius-Medium); } .levelSummary { display: flex; flex-direction: column; align-items: center; - gap: 1.6rem; + gap: var(--Spacing-x2); } .levelRequirements { background-color: var(--Main-Brand-Burgundy); - border-radius: 0.8rem; + border-radius: var(--Corner-radius-Medium); color: #f7e1d5; - padding: 0.4rem 0.8rem; + padding: var(--Spacing-x-half) var(--Spacing-x1); } .levelSummaryText { color: var(--Main-Brand-Burgundy); font-size: var(--typography-Footnote-Regular-fontSize); - line-height: 150%; + line-height: var(--typography-Body-Regular-lineHeight); margin: 0; } .benefitCard { background-color: var(--Main-Grey-White); border: 1px solid var(--Base-Border-Subtle); - border-radius: 0.4rem; + border-radius: var(--Corner-radius-Small); color: var(--Main-Brand-Burgundy); - padding: 0 1.6rem; + padding: 0 var(--Spacing-x2); z-index: 2; } @@ -155,7 +162,7 @@ .benefitInfo { border-bottom: 1px solid var(--Base-Border-Subtle); - padding: 1.5rem 0; + padding: var(--Spacing-x-one-and-half) 0; } .benefitComparison { @@ -167,22 +174,22 @@ display: flex; justify-content: center; align-items: center; - padding: 1rem; + padding: var(--Spacing-x-one-and-half); } .benefitValueContainer { display: flex; flex-direction: column; align-items: center; - gap: 1rem; + gap: var(--Spacing-x-one-and-half); } .benefitValue { background-color: var(--Main-Brand-Burgundy); - border-radius: 0.8rem; + border-radius: var(--Corner-radius-Medium); color: var(--Base-Surface-Primary-Hover-alt, #fff); font-size: var(--typography-Footnote-Regular-fontSize); - padding: 0.4rem 0.8rem; + padding: var(--Spacing-x-half) var(--Spacing-x1); } .benefitValueDetails { diff --git a/types/components/loyalty/blocks.ts b/types/components/loyalty/blocks.ts index 2644f1c3e..6eddfa1b3 100644 --- a/types/components/loyalty/blocks.ts +++ b/types/components/loyalty/blocks.ts @@ -66,8 +66,8 @@ export type LevelSummaryProps = { export type BenefitCardProps = { comparedValues: { - a: { unlocked: boolean; value?: string; valueDetails?: string } - b: { unlocked: boolean; value?: string; valueDetails?: string } + a: BenefitValueInformation + b: BenefitValueInformation } title: string description: string