Make sure that there is enough room for videos in kiosk mode and scroll if there isnt.

src/styles/components/_audiovideo.scss

@@ -331,9 +331,9 @@
 		bottom:2px;
 		text-align:center;
 		background:rgba(0,0,0,0.4);
-		padding-right:192px;
 		min-height:108px;
 		pointer-events:auto;
+		white-space:nowrap;
 		>div {
 			height:108px;
 			width:192px;

static/js/services/videolayout.js

@@ -90,13 +90,13 @@ define(["jquery", "underscore"], function($, _) {
 
             //console.log("resize", innerHeight, innerWidth);
             //console.log("resize", container, videos.length, aspectRatio, innerHeight, innerWidth);
+            var extraCSS = {};
 
             if (videos.length === 1) {
                 var newVideoWidth = innerWidth < aspectRatio * innerHeight ? innerWidth : aspectRatio * innerHeight;
                 var newVideoHeight = innerHeight < innerWidth / aspectRatio ? innerHeight : innerWidth / aspectRatio;
                 container.style.width = newVideoWidth + 'px';
                 container.style.left = ((innerWidth - newVideoWidth) / 2) + 'px';
-                var extraCSS = {};
             } else {
                 var space = innerHeight*innerWidth; // square pixels
                 var videoSpace = space/videos.length;
@@ -166,6 +166,7 @@ define(["jquery", "underscore"], function($, _) {
 			this.big = null;
 			this.remoteVideos.on("click", ".remoteVideo", _.bind(function(event) {
 				if ($(event.currentTarget).hasClass("remoteVideo")) {
+					event.stopPropagation();
 					this.makeBig($(event.currentTarget));
 				}
 			}, this));
@@ -214,6 +215,7 @@ define(["jquery", "underscore"], function($, _) {
 			var aspectRatio = remoteSize.width/remoteSize.height;
             var innerHeight = size.height - 110;
             var innerWidth = size.width;
+            var extraCSS = {};
 
 			var bigVideoWidth = innerWidth < aspectRatio * innerHeight ? innerWidth : aspectRatio * innerHeight;
             var bigVideoHeight = innerHeight < innerWidth / aspectRatio ? innerHeight : innerWidth / aspectRatio;
@@ -221,6 +223,22 @@ define(["jquery", "underscore"], function($, _) {
             this.bigVideo.style.width = bigVideoWidth + 'px';
             this.bigVideo.style.height = bigVideoHeight + 'px';
 
+            // Make space for own video on the right if width goes low.
+            if (((size.width - (videos.length-1) * 192) / 2) < 192) {
+            	extraCSS = {
+                    ".renderer-conferencekiosk .remoteVideos": {
+                        "margin-right": "192px",
+                        "overflow-x": "auto",
+                        "overflow-y": "hidden"
+                    }
+                };
+            }
+
+            $.injectCSS(extraCSS, {
+                truncateFirst: true,
+                containerName: dynamicCSSContainer
+            });
+
 		};
 
 		ConferenceKiosk.prototype.close = function(container, scope, controller) {

static/partials/audiovideo.html

@@ -5,7 +5,7 @@
         <div class="overlayLogo"></div>
     </div>
     <div class="remoteContainer">
-      <div class="remoteVideos"></div>
+      <div class="remoteVideos nicescroll"></div>
       <div class="miniContainer" ng-class="{talking: talking}">
         <video class="miniVideo" autoplay="autoplay" muted="true"></video>
       </div>