From 7cbbe0a6daa550af2e521e58afe22bbdc389cd85 Mon Sep 17 00:00:00 2001 From: beerose Date: Tue, 19 Sep 2023 14:35:19 +0200 Subject: [PATCH 1/2] conf: change room label style --- src/components/Conf/Schedule/ScheduleList.tsx | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/components/Conf/Schedule/ScheduleList.tsx b/src/components/Conf/Schedule/ScheduleList.tsx index 93eeada97f..fd5fd61b21 100644 --- a/src/components/Conf/Schedule/ScheduleList.tsx +++ b/src/components/Conf/Schedule/ScheduleList.tsx @@ -250,8 +250,21 @@ const ScheduleList: FC = ({ {speakers.join(", ")} )} - - Room: {session.venue} + + + {/* */} + + + {session.venue} From f73ec9a1f0c778043f8c40a43ace4b3a048c2eae Mon Sep 17 00:00:00 2001 From: beerose Date: Tue, 19 Sep 2023 14:38:07 +0200 Subject: [PATCH 2/2] fix conflict --- src/components/Conf/Schedule/ScheduleList.tsx | 44 ++++++++++++------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/src/components/Conf/Schedule/ScheduleList.tsx b/src/components/Conf/Schedule/ScheduleList.tsx index 5e1b62e68e..0cdd4a7801 100644 --- a/src/components/Conf/Schedule/ScheduleList.tsx +++ b/src/components/Conf/Schedule/ScheduleList.tsx @@ -256,22 +256,34 @@ const ScheduleList: FC = ({ {eventType} )} - - - {/* */} - - - {session.venue} - +
+ {showEventType ? eventType + " / " : ""} + {eventTitle} +
+ {speakers.length > 0 && ( + + {speakers.join(", ")} + + )} + + Room: {session.venue} + + {/* */} + + + {session.venue} + +
+
)