fix(popups): covered by labels.

pull/8612/head jitsi-meet_5508
Hristo Terezov 4 years ago
parent 04ee423257
commit fec2641730
  1. 2
      css/_labels.scss
  2. 1
      css/_popover.scss
  3. 2
      css/_transcription-subtitles.scss
  4. 6
      css/_variables.scss
  5. 8
      css/_videolayout_default.scss
  6. 1
      css/filmstrip/_horizontal_filmstrip.scss
  7. 3
      css/filmstrip/_tile_view.scss
  8. 5
      css/filmstrip/_tile_view_overrides.scss
  9. 8
      css/modals/invite/_invite_more.scss
  10. 4
      css/modals/video-quality/_video-quality.scss
  11. 10
      react/features/conference/components/web/InviteMore.js

@ -4,7 +4,7 @@
top: 30px; top: 30px;
right: 30px; right: 30px;
transition: right 0.5s; transition: right 0.5s;
z-index: $filmstripVideosZ + 1; z-index: $labelsZ;
.circular-label { .circular-label {
align-items: center; align-items: center;

@ -47,4 +47,5 @@
border-radius: 3px; border-radius: 3px;
margin: -16px -24px; margin: -16px -24px;
padding: 16px 24px; padding: 16px 24px;
z-index: $popoverZ;
} }

@ -12,7 +12,7 @@
1px 0px 1px rgba(0,0,0,0.3), 1px 0px 1px rgba(0,0,0,0.3),
0px 0px 1px rgba(0,0,0,0.3); 0px 0px 1px rgba(0,0,0,0.3);
transform: translateX(-50%); transform: translateX(-50%);
z-index: $filmstripVideosZ + 1; z-index: $subtitlesZ;
span { span {
background: black; background: black;

@ -114,7 +114,10 @@ $zindex1: 1;
$zindex2: 2; $zindex2: 2;
$zindex3: 3; $zindex3: 3;
$toolbarBackgroundZ: 4; $toolbarBackgroundZ: 4;
$filmstripVideosZ: 5; $labelsZ: 5;
$filmstripVideosZ: 6;
$subtitlesZ: 7;
$popoverZ: 8;
$zindex10: 10; $zindex10: 10;
$reloadZ: 20; $reloadZ: 20;
$poweredByZ: 100; $poweredByZ: 100;
@ -126,7 +129,6 @@ $tooltipsZ: 401;
$dropdownMaskZ: 900; $dropdownMaskZ: 900;
$dropdownZ: 901; $dropdownZ: 901;
$centeredVideoLabelZ: 1010; $centeredVideoLabelZ: 1010;
$popoverZ: 1015;
$overlayZ: 1016; $overlayZ: 1016;

@ -480,14 +480,6 @@
z-index: $reloadZ; /*The reload button should appear on top of the header!*/ z-index: $reloadZ; /*The reload button should appear on top of the header!*/
} }
.audiolevel {
display: inline-block;
position: absolute;
z-index: $zindex0;
border-radius:1px;
pointer-events: none;
}
#dominantSpeaker { #dominantSpeaker {
visibility: hidden; visibility: hidden;
width: 300px; width: 300px;

@ -6,7 +6,6 @@
} }
.horizontal-filmstrip .filmstrip { .horizontal-filmstrip .filmstrip {
position: absolute;
bottom: 0; bottom: 0;
right: 0; right: 0;
padding: 10px 5px; padding: 10px 5px;

@ -42,10 +42,9 @@
height: 100%; height: 100%;
justify-content: center; justify-content: center;
left: 0; left: 0;
position: fixed; position: absolute;
top: 0; top: 0;
width: 100%; width: 100%;
z-index: $filmstripVideosZ;
@media (min-width: 581px) { @media (min-width: 581px) {
&.shift-right { &.shift-right {

@ -22,11 +22,6 @@
display: none; display: none;
} }
#remoteConnectionMessage,
.watermark {
z-index: $filmstripVideosZ + 1;
}
/** /**
* The follow styling uses !important to override inline styles set with * The follow styling uses !important to override inline styles set with
* javascript. * javascript.

@ -7,10 +7,6 @@
text-align: center; text-align: center;
z-index: $zindex2; z-index: $zindex2;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0)); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
&.elevated {
z-index: $filmstripVideosZ + 1;
}
} }
&-header { &-header {
@ -98,11 +94,11 @@
border-radius: 4px; border-radius: 4px;
cursor: pointer; cursor: pointer;
} }
&:hover > div:hover { &:hover > div:hover {
background-color: rgba(255, 255, 255, 0.2); background-color: rgba(255, 255, 255, 0.2);
} }
& > :not(:last-child) { & > :not(:last-child) {
margin-right: 16px; margin-right: 16px;
} }

@ -111,7 +111,3 @@
display: none; display: none;
} }
} }
#videoResolutionLabel {
z-index: $zindex3 + 1;
}

@ -8,17 +8,11 @@ import { getParticipantCount } from '../../../base/participants';
import { connect } from '../../../base/redux'; import { connect } from '../../../base/redux';
import { beginAddPeople } from '../../../invite'; import { beginAddPeople } from '../../../invite';
import { isButtonEnabled, isToolboxVisible } from '../../../toolbox/functions.web'; import { isButtonEnabled, isToolboxVisible } from '../../../toolbox/functions.web';
import { shouldDisplayTileView } from '../../../video-layout/functions';
declare var interfaceConfig: Object; declare var interfaceConfig: Object;
type Props = { type Props = {
/**
* Whether tile view is enabled.
*/
_tileViewEnabled: Boolean,
/** /**
* Whether to show the option to invite more people * Whether to show the option to invite more people
* instead of the subject. * instead of the subject.
@ -44,14 +38,13 @@ type Props = {
* @returns {React$Element<any>} * @returns {React$Element<any>}
*/ */
function InviteMore({ function InviteMore({
_tileViewEnabled,
_visible, _visible,
onClick, onClick,
t t
}: Props) { }: Props) {
return ( return (
_visible _visible
? <div className = { `invite-more-container${_tileViewEnabled ? ' elevated' : ''}` }> ? <div className = 'invite-more-container'>
<div className = 'invite-more-header'> <div className = 'invite-more-header'>
{t('addPeople.inviteMoreHeader')} {t('addPeople.inviteMoreHeader')}
</div> </div>
@ -81,7 +74,6 @@ function mapStateToProps(state) {
const hide = interfaceConfig.HIDE_INVITE_MORE_HEADER; const hide = interfaceConfig.HIDE_INVITE_MORE_HEADER;
return { return {
_tileViewEnabled: shouldDisplayTileView(state),
_visible: isToolboxVisible(state) && isButtonEnabled('invite') && isAlone && !hide _visible: isToolboxVisible(state) && isButtonEnabled('invite') && isAlone && !hide
}; };
} }

Loading…
Cancel
Save