lfajardo
/
cloud_bbb
mirror of https://github.com/sualko/cloud_bbb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #304 from arawa/fix/icon_and_dialog_style 

style: missing icon and adapt dialog style to NC30
master
Thibaut 2024-10-28 08:54:55 +01:00 committed by GitHub
parent 787b0bd7eb 7a27041500
commit d86e6ce8f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ts/Manager/App.scss
View File

@ -16,7 +16,22 @@
.oc-dialog.bbb-dialog { .oc-dialog.bbb-dialog {
max-height: calc(100% - 70px); 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 { .bbb-mb-1 {

3
ts/Manager/RoomRow.tsx
View File

@ -180,7 +180,7 @@ const RoomRow: React.FC<Props> = (props) => {
function accessToIcon(access: string) { function accessToIcon(access: string) {
switch(access) { switch(access) {
case Access.Public: 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: case Access.Password:
return <span className="icon icon-visible icon-password" title={AccessOptions[access]} />; return <span className="icon icon-visible icon-password" title={AccessOptions[access]} />;
case Access.Internal: case Access.Internal:
@ -188,6 +188,7 @@ const RoomRow: React.FC<Props> = (props) => {
case Access.InternalRestricted: case Access.InternalRestricted:
return <span className="icon icon-visible icon-user" title={AccessOptions[access]} />; return <span className="icon icon-visible icon-user" title={AccessOptions[access]} />;
case Access.WaitingRoom: case Access.WaitingRoom:
case Access.WaitingRoomAll:
return <span className="icon icon-visible icon-timezone" title={AccessOptions[access]} />; return <span className="icon icon-visible icon-timezone" title={AccessOptions[access]} />;
} }

4
ts/Manager/ShareWith.tsx
View File

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