summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmood@users.noreply.github.com>2017-01-04 03:13:37 +0500
committerHarrison Healey <harrisonmhealey@gmail.com>2017-01-03 17:13:37 -0500
commit3bc7445322623028bad633a58668abe7b3eefe8c (patch)
treec9135a79ffe151654bf1af93eec30bbf2c00c0bc
parenta71fc7ff7f9c5a04771b003c1cd195c5bc75336c (diff)
downloadchat-3bc7445322623028bad633a58668abe7b3eefe8c.tar.gz
chat-3bc7445322623028bad633a58668abe7b3eefe8c.tar.bz2
chat-3bc7445322623028bad633a58668abe7b3eefe8c.zip
PLT-4617 - UI Improvements to webrtc (#4946)
-rw-r--r--webapp/components/webrtc/webrtc_controller.jsx8
-rw-r--r--webapp/sass/components/_webrtc.scss6
2 files changed, 4 insertions, 10 deletions
diff --git a/webapp/components/webrtc/webrtc_controller.jsx b/webapp/components/webrtc/webrtc_controller.jsx
index 6e63ca91d..94e5b3475 100644
--- a/webapp/components/webrtc/webrtc_controller.jsx
+++ b/webapp/components/webrtc/webrtc_controller.jsx
@@ -1084,7 +1084,6 @@ export default class WebrtcController extends React.Component {
let remoteVideoHidden = 'hidden';
let error;
let remoteMute;
- let videoClass = '';
let localImageHidden = 'webrtc__local-image hidden';
let remoteImageHidden = 'webrtc__remote-image';
@@ -1177,8 +1176,6 @@ export default class WebrtcController extends React.Component {
remoteVideoHidden = '';
remoteImageHidden = 'webrtc__remote-image hidden';
}
- } else {
- videoClass = 'small';
}
return (
@@ -1191,10 +1188,7 @@ export default class WebrtcController extends React.Component {
toggleSize={this.props.toggleSize}
/>
<div className='post-right__scroll'>
- <div
- id='videos'
- className={videoClass}
- >
+ <div id='videos'>
{remoteMute}
<div
id='main-video'
diff --git a/webapp/sass/components/_webrtc.scss b/webapp/sass/components/_webrtc.scss
index d53737b78..53135bd4c 100644
--- a/webapp/sass/components/_webrtc.scss
+++ b/webapp/sass/components/_webrtc.scss
@@ -141,7 +141,7 @@
&.full {
background: $black;
border: none;
- height: 80%;
+ height: 100%;
max-width: 100% !important;
right: 0;
top: 0;
@@ -319,7 +319,7 @@
.sidebar--right--expanded {
#videos {
- height: 100%;
+ height: calc(100% - 90px);
position: absolute;
#main-video {
@@ -333,7 +333,7 @@
}
.webrtc-buttons {
- bottom: 5px;
+ bottom: 15px;
position: absolute;
width: 100%;
}