diff --git a/apps/scandic-web/app/globals.css b/apps/scandic-web/app/globals.css index bd3e03b7d..644f3abfb 100644 --- a/apps/scandic-web/app/globals.css +++ b/apps/scandic-web/app/globals.css @@ -15,6 +15,7 @@ ); --sitewide-alert-height: 0px; /* Will be overridden when a sitewide alert is visible */ + --sitewide-alert-sticky-height: 0px; /* Will be overridden when a sticky sitewide alert is visible */ --campaign-banner-height: 0px; /* Will be overridden when a campaign banner is visible */ --alert-and-banner-height: calc( var(--sitewide-alert-height) + var(--campaign-banner-height) diff --git a/apps/scandic-web/components/CampaignBanner/campaignBanner.module.css b/apps/scandic-web/components/CampaignBanner/campaignBanner.module.css index 1c2158514..4f678775c 100644 --- a/apps/scandic-web/components/CampaignBanner/campaignBanner.module.css +++ b/apps/scandic-web/components/CampaignBanner/campaignBanner.module.css @@ -1,6 +1,5 @@ .campaignBanner { width: 100%; - z-index: var(--header-z-index); position: relative; background-color: var(--Surface-Brand-Primary-3-Default); } diff --git a/apps/scandic-web/components/ContentType/DestinationPage/DestinationOverviewPage/DestinationSearch/destinationSearch.module.css b/apps/scandic-web/components/ContentType/DestinationPage/DestinationOverviewPage/DestinationSearch/destinationSearch.module.css index 84d0a002d..1b172bf23 100644 --- a/apps/scandic-web/components/ContentType/DestinationPage/DestinationOverviewPage/DestinationSearch/destinationSearch.module.css +++ b/apps/scandic-web/components/ContentType/DestinationPage/DestinationOverviewPage/DestinationSearch/destinationSearch.module.css @@ -48,7 +48,7 @@ bottom: 0; left: 0; right: 0; - height: calc(100dvh - max(var(--alert-and-banner-height), 20px)); + height: calc(100dvh - max(var(--sitewide-alert-sticky-height), 20px)); border-radius: var(--Corner-radius-md) var(--Corner-radius-md) 0 0; background-color: var(--Surface-Primary-Default); box-shadow: 0px 0px 14px 6px rgba(0, 0, 0, 0.1); diff --git a/apps/scandic-web/components/ContentType/StartPage/startPage.module.css b/apps/scandic-web/components/ContentType/StartPage/startPage.module.css index 47852822a..846fc6222 100644 --- a/apps/scandic-web/components/ContentType/StartPage/startPage.module.css +++ b/apps/scandic-web/components/ContentType/StartPage/startPage.module.css @@ -1,7 +1,6 @@ .header { height: 560px; position: relative; - z-index: 10; } .header:after { @@ -19,7 +18,6 @@ color: var(--Text-Inverted); position: absolute; inset: 0; - z-index: 1; display: flex; align-items: center; justify-content: center; diff --git a/packages/booking-flow/lib/components/BookingWidget/BookingWidgetForm/FormContent/Search/SearchList/Dialog/dialog.module.css b/packages/booking-flow/lib/components/BookingWidget/BookingWidgetForm/FormContent/Search/SearchList/Dialog/dialog.module.css index 91abb1b4f..1c8aa72f3 100644 --- a/packages/booking-flow/lib/components/BookingWidget/BookingWidgetForm/FormContent/Search/SearchList/Dialog/dialog.module.css +++ b/packages/booking-flow/lib/components/BookingWidget/BookingWidgetForm/FormContent/Search/SearchList/Dialog/dialog.module.css @@ -9,7 +9,7 @@ overflow-y: auto; padding: var(--Spacing-x2) var(--Spacing-x3); position: fixed; - top: calc(140px + max(var(--alert-and-banner-height), 25px)); + top: calc(140px + max(var(--sitewide-alert-sticky-height), 25px)); width: 100%; height: calc(100% - 200px); z-index: 10010; diff --git a/packages/booking-flow/lib/components/BookingWidget/Client.tsx b/packages/booking-flow/lib/components/BookingWidget/Client.tsx index 56820263b..88eed10f8 100644 --- a/packages/booking-flow/lib/components/BookingWidget/Client.tsx +++ b/packages/booking-flow/lib/components/BookingWidget/Client.tsx @@ -257,8 +257,8 @@ export default function BookingWidgetClient({
+
-
) } diff --git a/packages/booking-flow/lib/components/BookingWidget/DatePicker/date-picker.module.css b/packages/booking-flow/lib/components/BookingWidget/DatePicker/date-picker.module.css index 1fa08e932..ee858839f 100644 --- a/packages/booking-flow/lib/components/BookingWidget/DatePicker/date-picker.module.css +++ b/packages/booking-flow/lib/components/BookingWidget/DatePicker/date-picker.module.css @@ -46,7 +46,7 @@ .container[data-datepicker-open="true"] .hideWrapper { border-radius: var(--Corner-radius-lg) var(--Corner-radius-lg) 0 0; - top: calc(max(var(--alert-and-banner-height), 20px)); + top: calc(max(var(--sitewide-alert-sticky-height), 20px)); } } diff --git a/packages/booking-flow/lib/components/BookingWidget/FloatingBookingWidget/FloatingBookingWidget.module.css b/packages/booking-flow/lib/components/BookingWidget/FloatingBookingWidget/FloatingBookingWidget.module.css index b63701c3d..cca9d663d 100644 --- a/packages/booking-flow/lib/components/BookingWidget/FloatingBookingWidget/FloatingBookingWidget.module.css +++ b/packages/booking-flow/lib/components/BookingWidget/FloatingBookingWidget/FloatingBookingWidget.module.css @@ -2,7 +2,6 @@ width: var(--max-width-content); margin: 0 auto; min-height: 88px; - z-index: 1000; position: relative; .floatingBackground { @@ -20,7 +19,7 @@ top: 0; left: 0; right: 0; - z-index: 1000; + z-index: var(--booking-widget-z-index); margin-top: var(--sitewide-alert-sticky-height); box-shadow: 0px 4px 24px 0px rgba(0, 0, 0, 0.05); } 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 5c2d157d2..f9e12fa23 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 @@ -22,7 +22,7 @@ left: 0; position: fixed; right: 0; - top: 20px; + top: calc(max(var(--sitewide-alert-sticky-height), 20px)); transition: top 300ms ease; z-index: 100; } diff --git a/packages/booking-flow/lib/components/BookingWidget/MobileToggleButton/button.module.css b/packages/booking-flow/lib/components/BookingWidget/MobileToggleButton/button.module.css index 68e318625..69666a67b 100644 --- a/packages/booking-flow/lib/components/BookingWidget/MobileToggleButton/button.module.css +++ b/packages/booking-flow/lib/components/BookingWidget/MobileToggleButton/button.module.css @@ -1,5 +1,5 @@ -.complete, -.partial { +.mobileToggleButton { + position: relative; border: none; align-items: center; box-shadow: 0px 8px 24px 0px rgba(0, 0, 0, 0.16); @@ -7,7 +7,6 @@ display: grid; gap: var(--Space-x15); padding: var(--Spacing-x2); - z-index: 1; background-color: var(--Base-Surface-Primary-light-Normal); width: 100%; /* In some cases the lingering pressend event will trigger the */ @@ -60,8 +59,7 @@ } @media screen and (min-width: 768px) { - .complete, - .partial { + .mobileToggleButton { display: none; } } diff --git a/packages/booking-flow/lib/components/BookingWidget/MobileToggleButton/index.tsx b/packages/booking-flow/lib/components/BookingWidget/MobileToggleButton/index.tsx index 28a66cb8c..f83f96513 100644 --- a/packages/booking-flow/lib/components/BookingWidget/MobileToggleButton/index.tsx +++ b/packages/booking-flow/lib/components/BookingWidget/MobileToggleButton/index.tsx @@ -1,5 +1,6 @@ "use client" +import { cx } from "class-variance-authority" import { Button } from "react-aria-components" import { useWatch } from "react-hook-form" import { useIntl } from "react-intl" @@ -96,7 +97,10 @@ export default function MobileToggleButton({ return (