From 781ff323db4c70e4ca476f9ef13a04e5aa063585 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Fri, 16 Sep 2016 15:35:13 -0300
Subject: Webrtc client side (#4026)

* WebRTC Server side

* WebRTC client side

* Bug fixes and improvements

* Pushing UI improvements for webrtc (#3728)

* Pushing UI improvements for webrtc

* Updating webrtc css

* PLT-3943 WebRTC P1: bug fixes and improvements

* Video resolution set to std, reduce volume of ringtone and flip video horizontally

* Fix calling a user B while WebRTC RHS is still opened

* Leave RHS opened when call ends, Fix isBusy on popover and channel_header

* Fix pre-release feature, RHS & System Console

* PLT-3945 - Updating UI for webrtc (#3908)

* PLT-3943 Webrtc p1

* Add ongoing call indicator when RHS is opened

* UI updates to to webrtc notifcation (#3959)
---
 webapp/sass/layout/_content.scss       | 3 ++-
 webapp/sass/layout/_headers.scss       | 3 ++-
 webapp/sass/layout/_sidebar-right.scss | 9 +++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'webapp/sass/layout')

diff --git a/webapp/sass/layout/_content.scss b/webapp/sass/layout/_content.scss
index 514093f1f..22e8a5369 100644
--- a/webapp/sass/layout/_content.scss
+++ b/webapp/sass/layout/_content.scss
@@ -1,7 +1,8 @@
 @charset 'UTF-8';
 
 .inner-wrap {
-    &.move--left {
+    &.move--left,
+    &.webrtc--show {
         .search-bar__container {
             display: none;
         }
diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss
index c3a5f8fda..7e1ccc554 100644
--- a/webapp/sass/layout/_headers.scss
+++ b/webapp/sass/layout/_headers.scss
@@ -388,7 +388,8 @@
             }
         }
 
-        .channel__wrap.move--left & {
+        .channel__wrap.move--left &,
+        .channel__wrap.webrtc--show & {
             position: absolute;
             right: -400px;
             top: 14px;
diff --git a/webapp/sass/layout/_sidebar-right.scss b/webapp/sass/layout/_sidebar-right.scss
index a70c30b16..915bb2d09 100644
--- a/webapp/sass/layout/_sidebar-right.scss
+++ b/webapp/sass/layout/_sidebar-right.scss
@@ -8,7 +8,11 @@
     position: fixed;
     right: 0;
     width: 400px;
-    z-index: 5;
+    z-index: 6;
+
+    &.webrtc {
+        z-index: 5;
+    }
 
     .sidebar--right__bg {
         @include single-transition(background-color, .5s, ease);
@@ -20,7 +24,8 @@
         width: 300%;
     }
 
-    &.move--left {
+    &.move--left,
+    &.webrtc--show {
         .sidebar--right__bg {
             left: -100%;
         }
-- 
cgit v1.2.3-1-g7c22