marking
/
WGShare.Client.Electron
18
0
Fork 0
Code Pull Requests 1 Actions Releases 4 Activity

yangjie #51

Open
yangqiang wants to merge 34 commits from yangjie into master
pull from: yangjie
merge into: marking:master
Conversation 0 Commits 34 Files Changed 31 +21 -8
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 338395810f - Show all commits

8
src/page/Meeting/UserListWindow/index.module.scss
View File

@ -52,9 +52,15 @@
align-items: center; align-items: center;
>span { >span {
font-size: 14px; display: flex;
flex-direction: column;
color: #F3F3F5; color: #F3F3F5;
margin-left: 4px; margin-left: 4px;
font-size: 13px;
>span {
font-size: 12px;
}
} }
>div { >div {

2
src/page/Meeting/UserListWindow/index.tsx
View File

@ -85,7 +85,7 @@ const UserListWindow: React.FC = () => {
<span> <span>
{item.userName}{item.uid === user.uid ? '(我)' : ''} {item.userName}{item.uid === user.uid ? '(我)' : ''}
{role.ID.includes(item.roleId) || item.isRoomManager ? {role.ID.includes(item.roleId) || item.isRoomManager ?
<span style={{ color: '#02B188', marginLeft: '4px' }}> <span>
{role.ID.includes(item.roleId) ? '管理员' : '发言人'} {role.ID.includes(item.roleId) ? '管理员' : '发言人'}
</span> </span>
: null} : null}

13
src/page/Meeting/index.module.scss
View File

@ -500,7 +500,7 @@
height: 100%; height: 100%;
.meetingUserList { .meetingUserList {
width: 300px; width: 340px;
height: 100%; height: 100%;
padding: 10px 0 20px; padding: 10px 0 20px;
box-sizing: border-box; box-sizing: border-box;
@ -546,11 +546,18 @@
align-items: center; align-items: center;
>span { >span {
font-size: 14px;
color: #F3F3F5; color: #F3F3F5;
margin-left: 4px; margin-left: 4px;
display: flex; display: flex;
align-items: center; flex-direction: column;
>span:nth-child(1) {
font-size: 13px;
}
>span:nth-child(2) {
font-size: 12px;
}
} }
>div { >div {

6
src/page/Meeting/index.tsx
View File

@ -3070,10 +3070,10 @@ const Meeting: React.FC = () => {
<div> <div>
<div><Avatar name={item.userName} /></div> <div><Avatar name={item.userName} /></div>
<span> <span>
<span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', maxWidth: role.ID.includes(item.roleId) || item.isRoomManager ? '50px' : '80px' }} title={item.userName}>{item.userName}</span>{item.uid === user.uid ? '(我)' : ''} <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', maxWidth: role.ID.includes(item.roleId) || item.isRoomManager ? '200px' : '200px' }} title={item.userName}>{item.userName}{item.uid === user.uid ? '(我)' : ''}</span>
{role.ID.includes(item.roleId) || item.isRoomManager ? {role.ID.includes(item.roleId) || item.isRoomManager ?
<span style={{ color: '#02B188', marginLeft: '4px' }}> <span>
{role.ID.includes(item.roleId) ? '管理员' : '发言人'} {role.ID.includes(item.roleId) ? '(管理员)' : '(发言人)'}
</span> </span>
: null} : null}
</span> </span>