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: display username in grid mode #18572

Merged
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -91,7 +91,6 @@ const WebcamConnecting = styled.div`
min-width: 100%;
border-radius: 10px;
background-color: ${webcamBackgroundColor};
scale: 1.5;
z-index: 0;

&::after {
Expand Down
Expand Up @@ -117,13 +117,15 @@ const UserActions = (props) => {
});
}

menuItems.push({
key: `${cameraId}-mirror`,
label: intl.formatMessage(intlMessages.mirrorLabel),
description: intl.formatMessage(intlMessages.mirrorDesc),
onClick: () => onHandleMirror(cameraId),
dataTest: 'mirrorWebcamBtn',
});
if (isStream) {
menuItems.push({
key: `${cameraId}-mirror`,
label: intl.formatMessage(intlMessages.mirrorLabel),
description: intl.formatMessage(intlMessages.mirrorDesc),
onClick: () => onHandleMirror(cameraId),
dataTest: 'mirrorWebcamBtn',
});
}

if (numOfStreams > 2 && isStream) {
menuItems.push({
Expand Down
Expand Up @@ -32,10 +32,7 @@ const DropdownTrigger = styled(DivElipsis)`

const UserName = styled(TextElipsis)`
position: relative;
max-width: 75%;
// Keep the background with 0.5 opacity, but leave the text with 1
background-color: rgba(0, 0, 0, 0.5);
border-radius: 1px;
color: ${colorOffWhite};
padding: 0 1rem 0 .5rem !important;
font-size: 80%;
Expand All @@ -48,7 +45,9 @@ const UserName = styled(TextElipsis)`
const Dropdown = styled.div`
display: flex;
outline: none !important;
width: 70%;
background-color: rgba(0, 0, 0, 0.5);
border-radius: 10px;
display: inline-block;

@media ${mediumUp} {
>[aria-expanded] {
Expand Down
Expand Up @@ -13,6 +13,7 @@ const UserAvatarStyled = styled(UserAvatar)`
width: 45%;
max-width: 66px;
max-height: 66px;
scale: 1.5;

${({ unhealthyStream }) => unhealthyStream && `
filter: grayscale(50%) opacity(50%);
Expand Down