From b972679c6e7ca6171f74a2464dc20bccaa1d8fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matilda=20Landstr=C3=B6m?= Date: Mon, 24 Mar 2025 08:52:17 +0000 Subject: [PATCH] Merged in feat/SW-1962-text-weight (pull request #1602) Feat(SW-1962): Fix title weights * feat(SW-1962): Fix title weights Approved-by: Christian Andolf Approved-by: Fredrik Thorsson --- .../AmenitiesList/amenitiesList.module.css | 4 ++++ .../HotelPage/AmenitiesList/index.tsx | 18 ++++++++++++------ .../HotelPage/IntroSection/index.tsx | 1 + .../ContentType/HotelPage/Rooms/index.tsx | 16 ++++++++++------ .../HotelPage/Rooms/rooms.module.css | 4 ++++ .../TempDesignSystem/SidePeek/index.tsx | 14 +++++--------- .../SidePeek/sidePeek.module.css | 4 ++++ 7 files changed, 40 insertions(+), 21 deletions(-) diff --git a/apps/scandic-web/components/ContentType/HotelPage/AmenitiesList/amenitiesList.module.css b/apps/scandic-web/components/ContentType/HotelPage/AmenitiesList/amenitiesList.module.css index d3e5d9d91..7c2119cdd 100644 --- a/apps/scandic-web/components/ContentType/HotelPage/AmenitiesList/amenitiesList.module.css +++ b/apps/scandic-web/components/ContentType/HotelPage/AmenitiesList/amenitiesList.module.css @@ -29,6 +29,10 @@ width: fit-content; } +.facility { + color: var(--Text-Secondary); +} + @media screen and (min-width: 1367px) { .amenitiesContainer { margin-top: var(--Spacing-x5); diff --git a/apps/scandic-web/components/ContentType/HotelPage/AmenitiesList/index.tsx b/apps/scandic-web/components/ContentType/HotelPage/AmenitiesList/index.tsx index 77058dc53..6cc93f62f 100644 --- a/apps/scandic-web/components/ContentType/HotelPage/AmenitiesList/index.tsx +++ b/apps/scandic-web/components/ContentType/HotelPage/AmenitiesList/index.tsx @@ -1,8 +1,8 @@ +import { Typography } from "@scandic-hotels/design-system/Typography" + import { mapFacilityToIcon } from "@/components/ContentType/HotelPage/data" import { ChevronRightSmallIcon } from "@/components/Icons" import Link from "@/components/TempDesignSystem/Link" -import Body from "@/components/TempDesignSystem/Text/Body" -import Subtitle from "@/components/TempDesignSystem/Text/Subtitle" import { getIntl } from "@/i18n" import styles from "./amenitiesList.module.css" @@ -18,9 +18,9 @@ export default async function AmenitiesList({ return (
- - {intl.formatMessage({ id: "At the hotel" })} - + +

{intl.formatMessage({ id: "At the hotel" })}

+
{facilities.map((facility) => { const IconComponent = mapFacilityToIcon(facility.id) @@ -34,7 +34,12 @@ export default async function AmenitiesList({ height={20} /> )} - {facility.name} + +

{facility.name}

+
) })} @@ -44,6 +49,7 @@ export default async function AmenitiesList({ href={`#s-${SidepeekSlugs.amenities}`} color="burgundy" variant="icon" + weight="bold" className={styles.showAllAmenities} > {intl.formatMessage({ id: "See all amenities" })} diff --git a/apps/scandic-web/components/ContentType/HotelPage/IntroSection/index.tsx b/apps/scandic-web/components/ContentType/HotelPage/IntroSection/index.tsx index 33e8dfd3b..f0c8672b3 100644 --- a/apps/scandic-web/components/ContentType/HotelPage/IntroSection/index.tsx +++ b/apps/scandic-web/components/ContentType/HotelPage/IntroSection/index.tsx @@ -67,6 +67,7 @@ export default async function IntroSection({ className={styles.introLink} color="burgundy" variant="icon" + weight="bold" href={`#s-${SidepeekSlugs.about}`} scroll={false} > diff --git a/apps/scandic-web/components/ContentType/HotelPage/Rooms/index.tsx b/apps/scandic-web/components/ContentType/HotelPage/Rooms/index.tsx index 808e4865b..8c2443ffc 100644 --- a/apps/scandic-web/components/ContentType/HotelPage/Rooms/index.tsx +++ b/apps/scandic-web/components/ContentType/HotelPage/Rooms/index.tsx @@ -3,11 +3,11 @@ import { useRef, useState } from "react" import { useIntl } from "react-intl" +import { Typography } from "@scandic-hotels/design-system/Typography" + import SectionContainer from "@/components/Section/Container" import Grids from "@/components/TempDesignSystem/Grids" import ShowMoreButton from "@/components/TempDesignSystem/ShowMoreButton" -import Body from "@/components/TempDesignSystem/Text/Body" -import Title from "@/components/TempDesignSystem/Text/Title" import { RoomCard } from "./RoomCard" @@ -37,10 +37,14 @@ export function Rooms({ rooms, preamble }: RoomsProps) { >
- - {intl.formatMessage({ id: "Rooms" })} - - {preamble && {preamble}} + +

{intl.formatMessage({ id: "Rooms" })}

+ + {preamble && ( + +

{preamble}

+ + )}
{title ? ( - - {title} - + +

{title}

+ ) : null}