From ce4358711545b6dd2e23fb6ba2eed0471b282503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matilda=20Landstr=C3=B6m?= Date: Fri, 28 Feb 2025 13:14:09 +0000 Subject: [PATCH] Merged in fix/hotel-subpages (pull request #1445) fix: add grid * fix: add grid * fix: add undefined check Approved-by: Erik Tiekstra Approved-by: Fredrik Thorsson --- .../ContentType/HotelSubpage/Sidebar/MeetingsSidebar.tsx | 2 +- .../HotelSubpage/Sidebar/RestaurantSidebar.tsx | 2 +- .../ContentType/HotelSubpage/Sidebar/sidebar.module.css | 4 ++++ .../components/ContentType/HotelSubpage/index.tsx | 8 +++++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/MeetingsSidebar.tsx b/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/MeetingsSidebar.tsx index 792fdb188..6d0ba8346 100644 --- a/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/MeetingsSidebar.tsx +++ b/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/MeetingsSidebar.tsx @@ -26,7 +26,7 @@ export default async function MeetingsSidebar({ {intl.formatMessage({ id: "Contact us" })} -
+
{phoneNumber} {country === Country.Finland ? ( diff --git a/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/RestaurantSidebar.tsx b/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/RestaurantSidebar.tsx index b13e064cb..ec37b3222 100644 --- a/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/RestaurantSidebar.tsx +++ b/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/RestaurantSidebar.tsx @@ -86,7 +86,7 @@ export default async function RestaurantSidebar({ {intl.formatMessage({ id: "Contact us" })} -
+
{phoneNumber && ( {phoneNumber} )} diff --git a/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/sidebar.module.css b/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/sidebar.module.css index 69d9b40a0..eebe631f7 100644 --- a/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/sidebar.module.css +++ b/apps/scandic-web/components/ContentType/HotelSubpage/Sidebar/sidebar.module.css @@ -19,6 +19,10 @@ display: none; } +.contactDetails { + display: grid; +} + @media (min-width: 1367px) { .sidebar { grid-column: 2; diff --git a/apps/scandic-web/components/ContentType/HotelSubpage/index.tsx b/apps/scandic-web/components/ContentType/HotelSubpage/index.tsx index d0ae8a975..2e6f486a0 100644 --- a/apps/scandic-web/components/ContentType/HotelSubpage/index.tsx +++ b/apps/scandic-web/components/ContentType/HotelSubpage/index.tsx @@ -108,9 +108,11 @@ export default async function HotelSubpage({ />
-
- {pageData.elevatorPitch} -
+ {pageData.elevatorPitch && ( +
+ {pageData.elevatorPitch} +
+ )} {pageData.mainBody && }