From 781ff323db4c70e4ca476f9ef13a04e5aa063585 Mon Sep 17 00:00:00 2001 From: enahum 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/responsive/_desktop.scss | 9 ++++++--- webapp/sass/responsive/_mobile.scss | 6 ++++-- webapp/sass/responsive/_tablet.scss | 12 ++++++++---- 3 files changed, 18 insertions(+), 9 deletions(-) (limited to 'webapp/sass/responsive') diff --git a/webapp/sass/responsive/_desktop.scss b/webapp/sass/responsive/_desktop.scss index d891fe17f..50df5ba02 100644 --- a/webapp/sass/responsive/_desktop.scss +++ b/webapp/sass/responsive/_desktop.scss @@ -2,7 +2,8 @@ @media screen and (max-width: 1800px) { .inner-wrap { - &.move--left { + &.move--left, + &.webrtc--show { .date-separator, .new-separator { &.hovered--comment { @@ -18,7 +19,8 @@ @media screen and (max-width: 1440px) { .inner-wrap { - &.move--left { + &.move--left, + &.webrtc--show { .help__format-text { display: none; } @@ -53,7 +55,8 @@ } .inner-wrap { - &.move--left { + &.move--left, + &.webrtc--show { .file-overlay { font-size: em(18px); diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index e00b818e7..c39870bd8 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -779,7 +779,8 @@ display: block; width: 290px; - &.move--left { + &.move--left, + &.webrtc--show { @include translate3d(0, 0, 0); } } @@ -958,7 +959,8 @@ } } - &.move--left { + &.move--left, + &.webrtc--show { margin: 0; @include translate3d(-100%, 0, 0); } diff --git a/webapp/sass/responsive/_tablet.scss b/webapp/sass/responsive/_tablet.scss index 36b6af851..45fc4fad4 100644 --- a/webapp/sass/responsive/_tablet.scss +++ b/webapp/sass/responsive/_tablet.scss @@ -17,7 +17,8 @@ @include single-transition(all, .5s, ease); @include translateX(100%); - &.move--left { + &.move--left, + &.webrtc--show { -webkit-transform: translateX(0) !important; -moz-transform: translateX(0) !important; -ms-transform: translateX(0) !important; @@ -53,7 +54,8 @@ margin-right: 0 !important; } - &.move--left { + &.move--left, + &.webrtc--show { margin-right: 0 !important; .channel-header__links { @@ -72,7 +74,8 @@ } .sidebar--right { - &.move--left { + &.move--left, + &.webrtc--show { @include translateX(0); } @@ -106,7 +109,8 @@ } .inner-wrap { - &.move--left { + &.move--left, + &.webrtc--show { margin-right: 400px; } } -- cgit v1.2.3-1-g7c22