From aa7a7a8c2fa8d654a2f180aea4becdad48ba786f Mon Sep 17 00:00:00 2001 From: Bianca Widstam Date: Wed, 20 Aug 2025 06:38:18 +0000 Subject: [PATCH] Merged in fix/SW-2790-room-picker-buttons (pull request #2667) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(SW-2790): update ui room picker buttons * fix(SW-2790): update ui room picker buttons * fix(SW-2790 Approved-by: Matilda Landström --- .../Counter/counter.module.css | 1 + .../GuestsRoomsPicker/Counter/index.tsx | 36 ++++++------- .../BookingWidget/GuestsRoomsPicker/Form.tsx | 54 ++++++++++--------- .../guests-rooms-picker.module.css | 3 +- 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/Counter/counter.module.css b/packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/Counter/counter.module.css index 75eff082c..61ebe9241 100644 --- a/packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/Counter/counter.module.css +++ b/packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/Counter/counter.module.css @@ -3,6 +3,7 @@ justify-content: flex-end; align-items: center; gap: 20px; + color: var(--Text-Interactive-Default); } .counterBtn { width: 40px; diff --git a/packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/Counter/index.tsx b/packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/Counter/index.tsx index 23526acdb..8bca160c2 100644 --- a/packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/Counter/index.tsx +++ b/packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/Counter/index.tsx @@ -1,10 +1,10 @@ "use client" -import Body from "@scandic-hotels/design-system/Body" import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" -import { OldDSButton as Button } from "@scandic-hotels/design-system/OldDSButton" import styles from "./counter.module.css" +import { IconButton } from "@scandic-hotels/design-system/IconButton" +import { Typography } from "@scandic-hotels/design-system/Typography" type CounterProps = { count: number @@ -23,33 +23,27 @@ export default function Counter({ }: CounterProps) { return (
- - - {count} - - +
) } diff --git a/packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/Form.tsx b/packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/Form.tsx index f8fe59ef1..d7978eb0a 100644 --- a/packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/Form.tsx +++ b/packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/Form.tsx @@ -5,7 +5,6 @@ import { useFormContext, useWatch } from "react-hook-form" import { useIntl } from "react-intl" import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" -import { OldDSButton as Button } from "@scandic-hotels/design-system/OldDSButton" import { Tooltip } from "@scandic-hotels/design-system/Tooltip" import { Typography } from "@scandic-hotels/design-system/Typography" import { SEARCH_TYPE_REDEMPTION } from "@scandic-hotels/trpc/constants/booking" @@ -16,6 +15,7 @@ import styles from "./guests-rooms-picker.module.css" import type { GuestsRoom as TGuestsRoom } from ".." import type { BookingWidgetSchema } from "../Client" +import { Button } from "@scandic-hotels/design-system/Button" const MAX_ROOMS = 4 @@ -114,13 +114,13 @@ export default function GuestsRoomsPickerDialog({ {addRoomDisabledTextForSpecialRate ? (
diff --git a/packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/guests-rooms-picker.module.css b/packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/guests-rooms-picker.module.css index 110ee19d9..75bbfa976 100644 --- a/packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/guests-rooms-picker.module.css +++ b/packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/guests-rooms-picker.module.css @@ -236,7 +236,8 @@ .footer button { margin-left: auto; - width: 125px; + width: auto; + min-width: 125px; } .footer .hideOnDesktop,