Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(moderation) fix ui styles for advanced moderation context menu #9758

Merged
merged 1 commit into from
Aug 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions react/features/participants-pane/components/FooterContextMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import { MuteEveryonesVideoDialog } from '../../video-menu/components';

import {
ContextMenu,
ContextMenuItem
ContextMenuItem,
ContextMenuItemGroup
} from './web/styled';

const useStyles = makeStyles(() => {
Expand All @@ -33,11 +34,11 @@ const useStyles = makeStyles(() => {
right: 0,
top: '-8px',
transform: 'translateY(-100%)',
width: '238px'
width: '283px'
},
text: {
marginLeft: '52px',
lineHeight: '40px'
color: '#C2C2C2',
padding: '10px 16px 10px 52px'
},
paddedAction: {
marginLeft: '36px;'
Expand Down Expand Up @@ -74,17 +75,18 @@ export const FooterContextMenu = ({ onMouseLeave }: Props) => {
<ContextMenu
className = { classes.contextMenu }
onMouseLeave = { onMouseLeave }>
<ContextMenuItem
id = 'participants-pane-context-menu-stop-video'
onClick = { muteAllVideo }>
<Icon
size = { 20 }
src = { IconVideoOff } />
<span>{ t('participantsPane.actions.stopEveryonesVideo') }</span>
</ContextMenuItem>

<ContextMenuItemGroup>
<ContextMenuItem
id = 'participants-pane-context-menu-stop-video'
onClick = { muteAllVideo }>
<Icon
size = { 20 }
src = { IconVideoOff } />
<span>{ t('participantsPane.actions.stopEveryonesVideo') }</span>
</ContextMenuItem>
</ContextMenuItemGroup>
{ isModerationSupported && !allModerators ? (
<>
<ContextMenuItemGroup>
<div className = { classes.text }>
{t('participantsPane.actions.allow')}
</div>
Expand All @@ -106,7 +108,7 @@ export const FooterContextMenu = ({ onMouseLeave }: Props) => {
<span>{ t('participantsPane.actions.startModeration') }</span>
</ContextMenuItem>
)}
</>
</ContextMenuItemGroup>
) : undefined
}
</ContextMenu>
Expand Down
2 changes: 1 addition & 1 deletion react/features/participants-pane/components/web/styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export const ContextMenuItem = styled.div`
cursor: pointer;
display: flex;
min-height: 40px;
padding: 8px 16px;
padding: 10px 16px;

& > *:not(:last-child) {
margin-right: 16px;
Expand Down