diff --git a/components/HotelReservation/EnterDetails/SectionAccordion/index.tsx b/components/HotelReservation/EnterDetails/SectionAccordion/index.tsx index 9ece9b322..da8fbdcb5 100644 --- a/components/HotelReservation/EnterDetails/SectionAccordion/index.tsx +++ b/components/HotelReservation/EnterDetails/SectionAccordion/index.tsx @@ -5,7 +5,6 @@ import { useIntl } from "react-intl" import { useEnterDetailsStore } from "@/stores/enter-details" import { CheckIcon, ChevronDownIcon } from "@/components/Icons" -import Button from "@/components/TempDesignSystem/Button" import Footnote from "@/components/TempDesignSystem/Text/Footnote" import Subtitle from "@/components/TempDesignSystem/Text/Subtitle" @@ -72,9 +71,10 @@ export default function SectionAccordion({
-
-
+
+
- {isComplete && !isOpen && ( - - )} + + {isComplete && !isOpen && ( + + )} +
{children}
diff --git a/components/HotelReservation/EnterDetails/SectionAccordion/sectionAccordion.module.css b/components/HotelReservation/EnterDetails/SectionAccordion/sectionAccordion.module.css index 7b9ea37dc..fc3de1764 100644 --- a/components/HotelReservation/EnterDetails/SectionAccordion/sectionAccordion.module.css +++ b/components/HotelReservation/EnterDetails/SectionAccordion/sectionAccordion.module.css @@ -2,25 +2,33 @@ position: relative; display: flex; flex-direction: row; - gap: var(--Spacing-x3); - + gap: var(--Spacing-x-one-and-half); padding-top: var(--Spacing-x3); } -.wrapper:not(:last-child)::after { - position: absolute; - left: 12px; - bottom: 0; - top: var(--Spacing-x5); - height: 100%; - content: ""; - border-left: 1px solid var(--Primary-Light-On-Surface-Divider-subtle); -} - .wrapper:last-child .main { border-bottom: none; } +.modifyButton { + display: grid; + grid-template-areas: "title button" "selection button"; + cursor: pointer; + background-color: transparent; + border: none; + width: 100%; +} + +.title { + grid-area: title; + text-align: start; +} + +.button { + grid-area: button; + justify-self: flex-end; +} + .main { display: grid; gap: var(--Spacing-x3); @@ -31,21 +39,14 @@ grid-template-rows: 2em 0fr; } -.headerContainer { - display: flex; - justify-content: space-between; - align-items: center; -} - .selection { font-weight: 450; font-size: var(--typography-Title-4-fontSize); + grid-area: selection; } .iconWrapper { position: relative; - top: var(--Spacing-x1); - z-index: 1; } .circle { @@ -78,3 +79,23 @@ .content { overflow: hidden; } + +@media screen and (min-width: 1367px) { + .wrapper { + gap: var(--Spacing-x3); + } + + .iconWrapper { + top: var(--Spacing-x1); + } + + .wrapper:not(:last-child)::after { + position: absolute; + left: 12px; + bottom: 0; + top: var(--Spacing-x7); + height: 100%; + content: ""; + border-left: 1px solid var(--Primary-Light-On-Surface-Divider-subtle); + } +} diff --git a/components/HotelReservation/EnterDetails/SelectedRoom/ToggleSidePeek.tsx b/components/HotelReservation/EnterDetails/SelectedRoom/ToggleSidePeek.tsx index cf14b995b..db0d5c097 100644 --- a/components/HotelReservation/EnterDetails/SelectedRoom/ToggleSidePeek.tsx +++ b/components/HotelReservation/EnterDetails/SelectedRoom/ToggleSidePeek.tsx @@ -4,6 +4,7 @@ import { useIntl } from "react-intl" import useSidePeekStore from "@/stores/sidepeek" +import ChevronRight from "@/components/Icons/ChevronRight" import Button from "@/components/TempDesignSystem/Button" import { SidePeekEnum } from "@/types/components/hotelReservation/sidePeek" @@ -28,6 +29,7 @@ export default function ToggleSidePeek({ wrapping > {intl.formatMessage({ id: "See room details" })}{" "} + ) } diff --git a/components/HotelReservation/EnterDetails/SelectedRoom/index.tsx b/components/HotelReservation/EnterDetails/SelectedRoom/index.tsx index 4f673e923..64e9e0960 100644 --- a/components/HotelReservation/EnterDetails/SelectedRoom/index.tsx +++ b/components/HotelReservation/EnterDetails/SelectedRoom/index.tsx @@ -33,26 +33,25 @@ export default function SelectedRoom({
-
- -

{intl.formatMessage({ id: "Your room" })}

-
- - {room.roomType}{" "} - {`(${rateDescription})`} - -
- + +

{intl.formatMessage({ id: "Your room" })}

+
+ + {room.roomType}{" "} + {rateDescription} + {intl.formatMessage({ id: "Total price" })}: {intl.formatMessage( { id: "{amount} {currency}" }, { - amount: formatNumber(totalPrice.local.price), + amount: intl.formatNumber(totalPrice.local.price), currency: totalPrice.local.currency, } )} diff --git a/components/HotelReservation/EnterDetails/Summary/index.tsx b/components/HotelReservation/EnterDetails/Summary/index.tsx index 188ba94e3..738f26fd9 100644 --- a/components/HotelReservation/EnterDetails/Summary/index.tsx +++ b/components/HotelReservation/EnterDetails/Summary/index.tsx @@ -1,12 +1,14 @@ "use client" import { useEffect, useState } from "react" +import { ChevronDown } from "react-feather" import { useIntl } from "react-intl" import { dt } from "@/lib/dt" import { useEnterDetailsStore } from "@/stores/enter-details" -import { ArrowRightIcon, CloseIcon } from "@/components/Icons" +import { ArrowRightIcon } from "@/components/Icons" +import Button from "@/components/TempDesignSystem/Button" import Divider from "@/components/TempDesignSystem/Divider" import Link from "@/components/TempDesignSystem/Link" import Body from "@/components/TempDesignSystem/Text/Body" @@ -116,18 +118,25 @@ export default function Summary({ }) }, [room.localPrice, room.euroPrice, setTotalPrice]) - const showToggleButton = true - return (
-
- {intl.formatMessage({ id: "Summary" })} +
+ + {intl.formatMessage({ id: "Summary" })} + {dt(fromDate).locale(lang).format("ddd, D MMM")} {dt(toDate).locale(lang).format("ddd, D MMM")} ({nights}) - {showToggleButton ? : null} +
diff --git a/components/HotelReservation/EnterDetails/Summary/summary.module.css b/components/HotelReservation/EnterDetails/Summary/summary.module.css index 3b933f9b8..426afbc7d 100644 --- a/components/HotelReservation/EnterDetails/Summary/summary.module.css +++ b/components/HotelReservation/EnterDetails/Summary/summary.module.css @@ -7,11 +7,28 @@ height: 100%; } +.header { + display: grid; + grid-template-areas: "title button" "date button"; +} + +.title { + grid-area: title; +} + +.chevronButton { + grid-area: button; + justify-self: end; + align-items: center; + margin-right: calc(0px - var(--Spacing-x2)); +} + .date { align-items: center; display: flex; gap: var(--Spacing-x1); justify-content: flex-start; + grid-area: date; } .link { @@ -47,4 +64,12 @@ .bottomDivider { display: block; } + + .header { + display: block; + } + + .chevronButton { + display: none; + } }