From 7a2704150037aa9a5bc0d72c88f42117c3fc5065 Mon Sep 17 00:00:00 2001 From: Sebastien Marinier Date: Fri, 25 Oct 2024 18:50:06 +0200 Subject: [PATCH] style: missing icon and adapt dialog style to NC30 Signed-off-by: Sebastien Marinier --- ts/Manager/App.scss | 17 ++++++++++++++++- ts/Manager/RoomRow.tsx | 3 ++- ts/Manager/ShareWith.tsx | 4 ++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ts/Manager/App.scss b/ts/Manager/App.scss index 4f2c92d..59465e5 100644 --- a/ts/Manager/App.scss +++ b/ts/Manager/App.scss @@ -16,7 +16,22 @@ .oc-dialog.bbb-dialog { max-height: calc(100% - 70px); - margin-top: 25px; + margin-top: 0; + padding: 4px 24px; +} + +.bbb-dialog { + + .oc-dialog-title { + font-size: 21px; + text-align: center; + margin-top: 0; + } + + .oc-dialog-close { + padding: 0; + top: 0; + } } .bbb-mb-1 { diff --git a/ts/Manager/RoomRow.tsx b/ts/Manager/RoomRow.tsx index d854c6c..5feb620 100644 --- a/ts/Manager/RoomRow.tsx +++ b/ts/Manager/RoomRow.tsx @@ -180,7 +180,7 @@ const RoomRow: React.FC = (props) => { function accessToIcon(access: string) { switch(access) { case Access.Public: - return ; + return ; case Access.Password: return ; case Access.Internal: @@ -188,6 +188,7 @@ const RoomRow: React.FC = (props) => { case Access.InternalRestricted: return ; case Access.WaitingRoom: + case Access.WaitingRoomAll: return ; } diff --git a/ts/Manager/ShareWith.tsx b/ts/Manager/ShareWith.tsx index e3b9219..818cd21 100644 --- a/ts/Manager/ShareWith.tsx +++ b/ts/Manager/ShareWith.tsx @@ -106,9 +106,9 @@ const ShareWith: React.FC = ({ room, permission, shares: allShares, setSh {share.shareType === ShareType.Circle && }
-
{displayName} + {displayName} {(share.id === ROOM_OWNER_ID || !isOwner) && (' (' + permissionLabel(share.permission) + ')')} -
+
{(share.id > ROOM_OWNER_ID && isOwner) && selectPermission(share.permission, (value) => { setSharePermission(share, value);