diff --git a/app/[lang]/(live)/(protected)/my-pages/layout.module.css b/app/[lang]/(live)/(protected)/my-pages/layout.module.css index 6b967122c..bee1488c6 100644 --- a/app/[lang]/(live)/(protected)/my-pages/layout.module.css +++ b/app/[lang]/(live)/(protected)/my-pages/layout.module.css @@ -1,5 +1,5 @@ .layout { - background-color: var(--Scandic-Brand-Warm-White); + background-color: var(--Base-Background-Primary-Normal); display: grid; font-family: var(--typography-Body-Regular-fontFamily); gap: var(--Spacing-x3); diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@communication/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@communication/page.tsx index e8dbe1d87..300590bed 100644 --- a/app/[lang]/(live)/(protected)/my-pages/profile/@communication/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@communication/page.tsx @@ -11,7 +11,7 @@ export default async function CommunicationSlot() { return (
- + {formatMessage({ id: "My communication preferences" })} diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/page.tsx index c36fefabf..ce1152f73 100644 --- a/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/page.tsx @@ -15,7 +15,7 @@ export default async function CreditCardSlot() { return (
- + {formatMessage({ id: "My credit cards" })} diff --git a/app/[lang]/(live)/(public)/[contentType]/[uid]/layout.module.css b/app/[lang]/(live)/(public)/[contentType]/[uid]/layout.module.css index 998c4ff65..03a7eb926 100644 --- a/app/[lang]/(live)/(public)/[contentType]/[uid]/layout.module.css +++ b/app/[lang]/(live)/(public)/[contentType]/[uid]/layout.module.css @@ -1,5 +1,5 @@ .layout { - background-color: var(--Scandic-Brand-Warm-White); + background-color: var(--Base-Background-Primary-Normal); display: grid; font-family: var(--typography-Body-Regular-fontFamily); gap: var(--Spacing-x3); diff --git a/app/[lang]/webview/layout.module.css b/app/[lang]/webview/layout.module.css index e5a3ec68c..749f69d48 100644 --- a/app/[lang]/webview/layout.module.css +++ b/app/[lang]/webview/layout.module.css @@ -1,5 +1,5 @@ .layout { - background-color: var(--Scandic-Brand-Warm-White); + background-color: var(--Base-Background-Primary-Normal); font-family: var(--typography-Body-Regular-fontFamily); min-height: 100dvh; } diff --git a/components/Forms/Edit/Profile/index.tsx b/components/Forms/Edit/Profile/index.tsx index cd8041828..013c2dbcd 100644 --- a/components/Forms/Edit/Profile/index.tsx +++ b/components/Forms/Edit/Profile/index.tsx @@ -65,7 +65,7 @@ export default function Form({ user }: EditFormProps) {
- {formatMessage({ id: "Edit" })} + {formatMessage({ id: "Welcome" })} {user.name} diff --git a/components/TempDesignSystem/Link/link.module.css b/components/TempDesignSystem/Link/link.module.css index 137ef254c..57ca12e6f 100644 --- a/components/TempDesignSystem/Link/link.module.css +++ b/components/TempDesignSystem/Link/link.module.css @@ -98,7 +98,7 @@ } .burgundy { - color: var(--Scandic-Brand-Burgundy); + color: var(--Base-Text-High-contrast); } .pale { diff --git a/components/TempDesignSystem/LoyaltyCard/index.tsx b/components/TempDesignSystem/LoyaltyCard/index.tsx index b6dbd0008..b748407f1 100644 --- a/components/TempDesignSystem/LoyaltyCard/index.tsx +++ b/components/TempDesignSystem/LoyaltyCard/index.tsx @@ -37,11 +37,7 @@ export default function LoyaltyCard({ <Title as="h5" level="h3" textAlign="center"> {heading} - {bodyText ? ( - - {bodyText} - - ) : null} + {bodyText ? {bodyText} : null}
{link ? ( +} diff --git a/components/TempDesignSystem/Text/Preamble/preamble.module.css b/components/TempDesignSystem/Text/Preamble/preamble.module.css new file mode 100644 index 000000000..007cfe56f --- /dev/null +++ b/components/TempDesignSystem/Text/Preamble/preamble.module.css @@ -0,0 +1,42 @@ +.preamble { + margin: 0; + padding: 0; + font-family: var(--typography-Preamble-fontFamily); + font-size: clamp( + var(--typography-Preamble-Mobile-fontSize), + 0.3vw + 15px, + var(--typography-Preamble-Desktop-fontSize) + ); + font-weight: var(--typography-Preamble-fontWeight); + letter-spacing: var(--typography-Preamble-letterSpacing); + line-height: var(--typography-Preamble-lineHeight); + text-decoration: var(--typography-Preamble-textDecoration); +} + +.preambleFontOnly { + font-style: normal; +} + +.black { + color: var(--Main-Grey-100); +} + +.burgundy { + color: var(--Scandic-Brand-Burgundy); +} + +.pale { + color: var(--Scandic-Brand-Pale-Peach); +} + +.textMediumContrast { + color: var(--Base-Text-UI-Medium-contrast); +} + +.center { + text-align: center; +} + +.left { + text-align: left; +} diff --git a/components/TempDesignSystem/Text/Preamble/preamble.ts b/components/TempDesignSystem/Text/Preamble/preamble.ts new file mode 100644 index 000000000..7a8fd27f2 --- /dev/null +++ b/components/TempDesignSystem/Text/Preamble/preamble.ts @@ -0,0 +1,9 @@ +import { preambleVariants } from "./variants" + +import type { VariantProps } from "class-variance-authority" + +export interface CaptionProps + extends Omit, "color">, + VariantProps { + asChild?: boolean +} diff --git a/components/TempDesignSystem/Text/Preamble/variants.ts b/components/TempDesignSystem/Text/Preamble/variants.ts new file mode 100644 index 000000000..0eebf4d17 --- /dev/null +++ b/components/TempDesignSystem/Text/Preamble/variants.ts @@ -0,0 +1,23 @@ +import { cva } from "class-variance-authority" + +import styles from "./preamble.module.css" + +const config = { + variants: { + color: { + black: styles.black, + burgundy: styles.burgundy, + pale: styles.pale, + textMediumContrast: styles.textMediumContrast, + }, + textAlign: { + center: styles.center, + left: styles.left, + }, + }, + defaultVariants: { + color: "black", + }, +} as const + +export const preambleVariants = cva(styles.preamble, config) diff --git a/components/TempDesignSystem/Text/Subtitle/subtitle.module.css b/components/TempDesignSystem/Text/Subtitle/subtitle.module.css index 5ece6f396..d02215b80 100644 --- a/components/TempDesignSystem/Text/Subtitle/subtitle.module.css +++ b/components/TempDesignSystem/Text/Subtitle/subtitle.module.css @@ -10,7 +10,7 @@ 0.3vw + 15px, var(--typography-Subtitle-1-Desktop-fontSize) ); - font-weight: var(--typography-Subtitle-1-fontWeight); + font-weight: 600; letter-spacing: var(--typography-Subtitle-1-letterSpacing); line-height: var(--typography-Subtitle-1-lineHeight); } @@ -22,7 +22,7 @@ 0.3vw + 15px, var(--typography-Subtitle-2-Desktop-fontSize) ); - font-weight: var(--typography-Subtitle-2-fontWeight); + font-weight: 600; letter-spacing: var(--typography-Subtitle-2-letterSpacing); line-height: var(--typography-Subtitle-2-lineHeight); } diff --git a/components/TempDesignSystem/Text/Title/title.module.css b/components/TempDesignSystem/Text/Title/title.module.css index a63443328..d01be3335 100644 --- a/components/TempDesignSystem/Text/Title/title.module.css +++ b/components/TempDesignSystem/Text/Title/title.module.css @@ -1,6 +1,7 @@ .heading { margin: 0; padding: 0; + font-weight: 500; } .h1 { @@ -10,7 +11,6 @@ 2.6vw + 27px, var(--typography-Title-1-Desktop-fontSize) ); - font-weight: var(--typography-Title-1-fontWeight); letter-spacing: var(--typography-Title-1-letterSpacing); line-height: var(--typography-Title-1-lineHeight); text-decoration: var(--typography-Title-1-textDecoration); @@ -23,7 +23,6 @@ 2vw + 20px, var(--typography-Title-2-Desktop-fontSize) ); - font-weight: var(--typography-Title-2-fontWeight); letter-spacing: var(--typography-Title-2-letterSpacing); line-height: var(--typography-Title-2-lineHeight); text-decoration: var(--typography-Title-2-textDecoration); @@ -36,7 +35,6 @@ 0.6vw + 27px, var(--typography-Title-3-Desktop-fontSize) ); - font-weight: var(--typography-Title-3-fontWeight); letter-spacing: var(--typography-Title-3-letterSpacing); line-height: var(--typography-Title-3-lineHeight); text-decoration: var(--typography-Title-3-textDecoration); @@ -49,7 +47,6 @@ 0.6vw + 19px, var(--typography-Title-4-Desktop-fontSize) ); - font-weight: var(--typography-Title-4-fontWeight); letter-spacing: var(--typography-Title-4-letterSpacing); line-height: var(--typography-Title-4-lineHeight); text-decoration: var(--typography-Title-4-textDecoration); @@ -62,7 +59,6 @@ 0.3vw + 17px, var(--typography-Title-5-Desktop-fontSize) ); - font-weight: var(--typography-Title-5-fontWeight); letter-spacing: var(--typography-Title-5-letterSpacing); line-height: var(--typography-Title-5-lineHeight); text-decoration: var(--typography-Title-5-textDecoration); diff --git a/components/TempDesignSystem/Text/Title/variants.ts b/components/TempDesignSystem/Text/Title/variants.ts index 3fa36fbdb..27881b4d8 100644 --- a/components/TempDesignSystem/Text/Title/variants.ts +++ b/components/TempDesignSystem/Text/Title/variants.ts @@ -33,6 +33,7 @@ const config = { color: "burgundy", textAlign: "left", type: "h1", + textTransform: "uppercase", }, } as const diff --git a/i18n/dictionaries/da.json b/i18n/dictionaries/da.json index 85dc44c0e..4b4e55e2c 100644 --- a/i18n/dictionaries/da.json +++ b/i18n/dictionaries/da.json @@ -101,6 +101,7 @@ "uppercase letter": "stort bogstav", "Visiting address": "Besøgsadresse", "Welcome to": "Velkommen til", + "Welcome": "Velkommen", "Where should you go next?": "Hvor skal du tage hen næste gang?", "Which room class suits you the best?": "Hvilken rumklasse passer bedst til dig", "Year": "År", diff --git a/i18n/dictionaries/de.json b/i18n/dictionaries/de.json index 9450f2f48..020483999 100644 --- a/i18n/dictionaries/de.json +++ b/i18n/dictionaries/de.json @@ -101,6 +101,7 @@ "uppercase letter": "großbuchstabe", "Visiting address": "Besuchsadresse", "Welcome to": "Willkommen zu", + "Welcome": "Willkommen", "Where should you go next?": "Wohin soll es als nächstes gehen?", "Which room class suits you the best?": "Welche Zimmerklasse passt am besten zu Ihnen?", "Year": "Jahr", diff --git a/i18n/dictionaries/en.json b/i18n/dictionaries/en.json index 47fc067c1..b59ff7859 100644 --- a/i18n/dictionaries/en.json +++ b/i18n/dictionaries/en.json @@ -100,6 +100,7 @@ "to": "to", "User information": "User information", "uppercase letter": "uppercase letter", + "Welcome": "Welcome", "Visiting address": "Visiting address", "Welcome to": "Welcome to", "Where should you go next?": "Where should you go next?", diff --git a/i18n/dictionaries/fi.json b/i18n/dictionaries/fi.json index ebdebce89..e3745bb03 100644 --- a/i18n/dictionaries/fi.json +++ b/i18n/dictionaries/fi.json @@ -101,6 +101,7 @@ "uppercase letter": "iso kirjain", "Visiting address": "Käyntiosoite", "Welcome to": "Tervetuloa", + "Welcome": "Tervetuloa", "Where should you go next?": "Minne sinun pitäisi mennä seuraavaksi?", "Which room class suits you the best?": "Mikä huoneluokka sopii sinulle parhaiten?", "Year": "Vuosi", diff --git a/i18n/dictionaries/no.json b/i18n/dictionaries/no.json index debfd45a9..e67d844ac 100644 --- a/i18n/dictionaries/no.json +++ b/i18n/dictionaries/no.json @@ -101,6 +101,7 @@ "uppercase letter": "stor bokstav", "Visiting address": "Besøksadresse", "Welcome to": "Velkommen til", + "Welcome": "Velkommen", "Where should you go next?": "Hvor bør du gå videre?", "Which room class suits you the best?": "Hvilken romklasse passer deg best?", "Year": "År", diff --git a/i18n/dictionaries/sv.json b/i18n/dictionaries/sv.json index 0ef5ce1ee..6f0e99cde 100644 --- a/i18n/dictionaries/sv.json +++ b/i18n/dictionaries/sv.json @@ -100,6 +100,7 @@ "User information": "Användar information", "uppercase letter": "stor bokstav", "Visiting address": "Besöksadress", + "Welcome": "Välkommen", "Where should you go next?": "Vart ska du gå härnäst?", "Which room class suits you the best?": "Vilken rumsklass passar dig bäst?", "Year": "År",