diff --git a/src/styles/components/_audiovideo.scss b/src/styles/components/_audiovideo.scss
index e0db1349..57acc767 100644
--- a/src/styles/components/_audiovideo.scss
+++ b/src/styles/components/_audiovideo.scss
@@ -33,6 +33,12 @@ bottom:0px;
left:0px;
background:black;
}
+.withChat #audiovideo, .withBuddylist #audiovideo {
+right:260px;
+}
+.withBuddylist.withChat #audiovideo {
+right:520px;
+}
#audiovideo.fullscreen .remoteVideo .peeractions {
display:none;
}
diff --git a/src/styles/components/_rightslide.scss b/src/styles/components/_rightslide.scss
index 19568f1a..9623bae6 100644
--- a/src/styles/components/_rightslide.scss
+++ b/src/styles/components/_rightslide.scss
@@ -1,7 +1,7 @@
#rightslide {
position: absolute;
top: 44px;
-right: 0px;
+right: -260px;
bottom: 0px;
left: 0px;
z-index:5;
@@ -14,8 +14,8 @@ pointer-events:none;
overflow-x: auto;
overflow-y: hidden;
}
-#rightslide.slideright {
-right:-260px;
+.withBuddylist #rightslide {
+right:0px;
}
#rightslide .rightslidepane {
position:relative;
diff --git a/src/styles/components/_usability.scss b/src/styles/components/_usability.scss
index 0e2e76fa..590e4880 100644
--- a/src/styles/components/_usability.scss
+++ b/src/styles/components/_usability.scss
@@ -28,6 +28,14 @@ width:350px;
font-size:1.1em;
color:#aaa;
margin: 0 auto;
+-webkit-transition: left 200ms ease-in-out;
+-moz-transition: left 200ms ease-in-out;
+-ms-transition: left 200ms ease-in-out;
+-o-transition: left 200ms ease-in-out;
+transition: left 200ms ease-in-out;
+}
+.withSettings #help, .withChat.withBuddylist #help {
+left:-22%;
}
#help > div {
margin-left:-55%;
diff --git a/static/js/controllers/mediastreamcontroller.js b/static/js/controllers/mediastreamcontroller.js
index 04ba9c58..29c10a66 100644
--- a/static/js/controllers/mediastreamcontroller.js
+++ b/static/js/controllers/mediastreamcontroller.js
@@ -20,7 +20,7 @@
*/
define(['underscore', 'bigscreen', 'moment', 'webrtc.adapter'], function(_, BigScreen, moment) {
- return ["$scope", "$rootScope", "$window", "$timeout", "safeDisplayName", "safeApply", "mediaStream", "appData", "playSound", "desktopNotify", "alertify", "toastr", "translation", "fileDownload", function($scope, $rootScope, $window, $timeout, safeDisplayName, safeApply, mediaStream, appData, playSound, desktopNotify, alertify, toastr, translation, fileDownload) {
+ return ["$scope", "$rootScope", "$element", "$window", "$timeout", "safeDisplayName", "safeApply", "mediaStream", "appData", "playSound", "desktopNotify", "alertify", "toastr", "translation", "fileDownload", function($scope, $rootScope, $element, $window, $timeout, safeDisplayName, safeApply, mediaStream, appData, playSound, desktopNotify, alertify, toastr, translation, fileDownload) {
/*console.log("route", $route, $routeParams, $location);*/
@@ -552,6 +552,12 @@ define(['underscore', 'bigscreen', 'moment', 'webrtc.adapter'], function(_, BigS
}
});
+ $scope.$watch(function() {
+ return $element.attr("class");
+ }, function() {
+ $scope.$broadcast("mainresize");
+ });
+
mediaStream.webrtc.e.on("done", function() {
if (mediaStream.connector.connected) {
$scope.setStatus("waiting");