From c4ae9201db741e1dffffb12769305209b276fde7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matilda=20Landstr=C3=B6m?= Date: Mon, 17 Feb 2025 09:14:45 +0000 Subject: [PATCH] Merged in fix/SW-1065-meetings-subpage (pull request #1353) Fix(SW-1065): Meetings subpage * fix(SW-1065): allow meeting cards to have different heights * feat(SW-1065): add meetingroom description Approved-by: Erik Tiekstra Approved-by: Fredrik Thorsson --- .../Meetings/meetingsAdditionalContent.module.css | 4 ++++ components/TempDesignSystem/MeetingRoomCard/index.tsx | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/components/ContentType/HotelSubpage/AdditionalContent/Meetings/meetingsAdditionalContent.module.css b/components/ContentType/HotelSubpage/AdditionalContent/Meetings/meetingsAdditionalContent.module.css index 27ffde06f..b66948ef8 100644 --- a/components/ContentType/HotelSubpage/AdditionalContent/Meetings/meetingsAdditionalContent.module.css +++ b/components/ContentType/HotelSubpage/AdditionalContent/Meetings/meetingsAdditionalContent.module.css @@ -1,3 +1,7 @@ +.grid { + align-items: flex-start; +} + .grid:not(.allVisible) > :nth-child(n + 4) { display: none; } diff --git a/components/TempDesignSystem/MeetingRoomCard/index.tsx b/components/TempDesignSystem/MeetingRoomCard/index.tsx index ec2ffbc08..c9baf8ff3 100644 --- a/components/TempDesignSystem/MeetingRoomCard/index.tsx +++ b/components/TempDesignSystem/MeetingRoomCard/index.tsx @@ -7,6 +7,7 @@ import Image from "@/components/Image" import Divider from "../Divider" import ShowMoreButton from "../ShowMoreButton" +import Body from "../Text/Body" import Caption from "../Text/Caption" import Subtitle from "../Text/Subtitle" import { translateRoomLighting, translateSeatingType } from "./utils" @@ -61,6 +62,11 @@ export default function MeetingRoomCard({ room }: MeetingRoomCardProps) { + {room.content.texts.descriptions.medium ? ( + + {room.content.texts.descriptions.medium} + + ) : null} {opened && (