From b19c4e828b713265fa22cf02ec37e9a653e591d2 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara <luixxiul@users.noreply.github.com> Date: Sun, 19 Jun 2022 23:24:25 +0900 Subject: [PATCH 1/2] Move the beta pill to the right side Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com> --- res/css/views/rooms/_RoomPreviewCard.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/res/css/views/rooms/_RoomPreviewCard.scss b/res/css/views/rooms/_RoomPreviewCard.scss index 782eb292487..3ee37e585d2 100644 --- a/res/css/views/rooms/_RoomPreviewCard.scss +++ b/res/css/views/rooms/_RoomPreviewCard.scss @@ -74,6 +74,7 @@ limitations under the License. // XXX Remove this when video rooms leave beta .mx_BetaCard_betaPill { + margin-inline-start: auto; align-self: start; } } From 9286553d59ec1baa8c8561cedacf75d2f2d7b8fc Mon Sep 17 00:00:00 2001 From: Suguru Hirahara <luixxiul@users.noreply.github.com> Date: Sun, 19 Jun 2022 23:36:10 +0900 Subject: [PATCH 2/2] Display pill on video room only Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com> --- src/components/views/rooms/RoomPreviewCard.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/views/rooms/RoomPreviewCard.tsx b/src/components/views/rooms/RoomPreviewCard.tsx index 132ba6720ea..b2d9710a7ce 100644 --- a/src/components/views/rooms/RoomPreviewCard.tsx +++ b/src/components/views/rooms/RoomPreviewCard.tsx @@ -102,7 +102,10 @@ const RoomPreviewCard: FC<IProps> = ({ room, onJoinButtonClicked, onRejectButton { inviteSender } </div> : null } </div> - <BetaPill onClick={viewLabs} tooltipTitle={_t("Video rooms are a beta feature")} /> + { room.isElementVideoRoom() + ? <BetaPill onClick={viewLabs} tooltipTitle={_t("Video rooms are a beta feature")} /> + : null + } </div>; }