Merge pull request littleredbutton#304 from arawa/fix/icon_and_dialog…

…_style style: missing icon and adapt dialog style to NC30
arawa · Oct 28, 2024 · d86e6ce · d86e6ce
2 parents 787b0bd + 7a27041
commit d86e6ce
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git 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
@@ -180,14 +180,15 @@ const RoomRow: React.FC<Props> = (props) => {
 	function accessToIcon(access: string) {
 		switch(access) {
 		case Access.Public:
-			return <span className="icon icon-visible icon-link" title={AccessOptions[access]} />;
+			return <span className="icon icon-visible icon-public" title={AccessOptions[access]} />;
 		case Access.Password:
 			return <span className="icon icon-visible icon-password" title={AccessOptions[access]} />;
 		case Access.Internal:
 			return <span className="icon icon-visible icon-group" title={AccessOptions[access]} />;
 		case Access.InternalRestricted:
 			return <span className="icon icon-visible icon-user" title={AccessOptions[access]} />;
 		case Access.WaitingRoom:
+		case Access.WaitingRoomAll:
 			return <span className="icon icon-visible icon-timezone" title={AccessOptions[access]} />;
 		}
 

diff --git a/ts/Manager/ShareWith.tsx b/ts/Manager/ShareWith.tsx
@@ -106,9 +106,9 @@ const ShareWith: React.FC<Props> = ({ room, permission, shares: allShares, setSh
 								{share.shareType === ShareType.Circle && <span className="icon-circle-white"></span>}
 							</div>
 							<div className="bbb-shareWith__item__label">
-								<h5>{displayName}
+								<span>{displayName}
 									{(share.id === ROOM_OWNER_ID || !isOwner) && (' (' + permissionLabel(share.permission) + ')')}
-								</h5>
+								</span>
 							</div>
 							{(share.id > ROOM_OWNER_ID && isOwner) && selectPermission(share.permission, (value) => {
 								setSharePermission(share, value);