BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18108 from Scroody/I-18077

Browse Source 
Fix: Presentation area in front of talking indicator elements.
This commit is contained in:
Ramón Souza 2023-06-12 15:45:20 -03:00 committed by GitHub
commit 8ae0f534b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/styles.js
View File

@ -63,7 +63,7 @@ const TalkingIndicatorButton = styled(Button)`
font-size: ${fontSizeXS};
}
[dir="rtl"] & {
[dir='rtl'] & {
margin-left: ${talkerMarginSm};
}
}
@ -84,7 +84,7 @@ const TalkingIndicatorButton = styled(Button)`
font-size: ${fontSizeXS};
}
[dir="rtl"] & {
[dir='rtl'] & {
right: calc(${talkerMarginSm} * -1);
}
}
@ -93,7 +93,8 @@ const TalkingIndicatorButton = styled(Button)`
opacity: 1;
}
${({ $spoke }) => $spoke && `
${({ $spoke }) => $spoke
&& `
opacity: ${spokeOpacity};
[dir="rtl"] & {
@ -101,7 +102,8 @@ const TalkingIndicatorButton = styled(Button)`
}
`}
${({ $muted }) => $muted && `
${({ $muted }) => $muted
&& `
cursor: default;
i {
@ -109,7 +111,8 @@ const TalkingIndicatorButton = styled(Button)`
}
`}
${({ $isViewer }) => $isViewer && `
${({ $isViewer }) => $isViewer
&& `
cursor: default;
`}
`;
@ -118,19 +121,16 @@ const CCIcon = styled(Icon)`
align-self: center;
color: ${colorWhite};
margin: 0 ${borderRadius};
font-size: calc(${fontSizeSmall} * .85);
opacity: ${({ muted, talking }) => ((muted || !talking) && `${spokeOpacity};`)
|| '1;'};
font-size: calc(${fontSizeSmall} * 0.85);
opacity: ${({ muted, talking }) => ((muted || !talking) && `${spokeOpacity};`) || '1;'};
`;
const TalkingIndicatorWrapper = styled.div`
border-radius: ${talkerBorderRadius} ${talkerBorderRadius};
display: flex;
margin: 0 ${borderRadius};
opacity: ${({ muted, talking }) => ((muted || !talking) && `${spokeOpacity};`)
|| '1;'};
background: ${({ muted, talking, floor }) => ((muted || !talking || !floor) && `${colorBackground};`)
|| `${colorSuccess}`}
opacity: ${({ muted, talking }) => ((muted || !talking) && `${spokeOpacity};`) || '1;'};
background: ${({ muted, talking, floor }) => ((muted || !talking || !floor) && `${colorBackground};`) || `${colorSuccess}`};
`;
const Hidden = styled.div`
@ -141,7 +141,6 @@ const IsTalkingWrapper = styled.div`
display: flex;
flex-direction: row;
position: relative;
margin-top: ${talkerMarginSm};
overflow: hidden;
`;