From 2cfd4659e13543caa4cc913be06ca199a820d34d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Fri, 16 Apr 2021 12:50:23 +0200 Subject: [PATCH] Add separate mx_CallView_content class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/css/views/voip/_CallView.scss | 12 ++++++------ src/components/views/voip/CallView.tsx | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/res/css/views/voip/_CallView.scss b/res/css/views/voip/_CallView.scss index 90a3ca4209..0a3865479a 100644 --- a/res/css/views/voip/_CallView.scss +++ b/res/css/views/voip/_CallView.scss @@ -64,14 +64,17 @@ limitations under the License. } } -.mx_CallView_voice { +.mx_CallView_content { position: relative; display: flex; - flex-direction: column; + border-radius: 8px; +} + +.mx_CallView_voice { align-items: center; justify-content: center; + flex-direction: column; background-color: $inverted-bg-color; - border-radius: 8px; } .mx_CallView_voice_avatarsContainer { @@ -108,11 +111,8 @@ limitations under the License. .mx_CallView_video { width: 100%; height: 100%; - position: relative; z-index: 30; - border-radius: 8px; overflow: hidden; - display: flex; } .mx_CallView_video_hold { diff --git a/src/components/views/voip/CallView.tsx b/src/components/views/voip/CallView.tsx index ea5411486f..544e54ec9d 100644 --- a/src/components/views/voip/CallView.tsx +++ b/src/components/views/voip/CallView.tsx @@ -536,6 +536,7 @@ export default class CallView extends React.Component { if (isOnHold || transfereeCall) { if (this.props.call.type === CallType.Video) { const containerClasses = classNames({ + mx_CallView_content: true, mx_CallView_video: true, mx_CallView_video_hold: isOnHold, }); @@ -557,6 +558,7 @@ export default class CallView extends React.Component { ); } else { const classes = classNames({ + mx_CallView_content: true, mx_CallView_voice: true, mx_CallView_voice_hold: isOnHold, }); @@ -586,6 +588,7 @@ export default class CallView extends React.Component { // to change anyway - I might take an axe to this file in order to // try to get other things working const classes = classNames({ + mx_CallView_content: true, mx_CallView_voice: true, }); @@ -622,6 +625,7 @@ export default class CallView extends React.Component { ; } else { const containerClasses = classNames({ + mx_CallView_content: true, mx_CallView_video: true, });