haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1262 from jitsi/ui-fixes 

Ui fixes
This commit is contained in:
Дамян Минков 2017-01-26 10:15:39 -06:00 committed by GitHub
parent 99a9fc054f cd5e84e4ef
commit 3fd33d0f50
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/_filmstrip.scss
View File

@ -70,7 +70,7 @@
display: none; display: none;
position: relative; position: relative;
background-size: contain; background-size: contain;
border: $thumbnailVideoBorder solid $thumbnailBorderColor; border: $thumbnailVideoBorder solid transparent;
border-radius: $borderRadius; border-radius: $borderRadius;
margin: 0 $thumbnailVideoMargin; margin: 0 $thumbnailVideoMargin;

1
css/_videolayout_default.scss
View File

@ -474,6 +474,7 @@
#localConnectionMessage { #localConnectionMessage {
display: none; display: none;
position: absolute; position: absolute;
left: 0;
width: 100%; width: 100%;
top:50%; top:50%;
z-index: 2; z-index: 2;

3
css/themes/_light.scss
View File

@ -85,9 +85,6 @@ $popupMenuSelectedItemBackground: rgba(256, 256, 256, .2);
// Toolbar // Toolbar
$splitterColor: #ccc; $splitterColor: #ccc;
// Thumbnail
$thumbnailBorderColor: rgba(71, 71, 71, .7);
/** /**
* Forms * Forms
*/ */

21
modules/UI/videolayout/VideoContainer.js
View File

@ -361,6 +361,9 @@ export class VideoContainer extends LargeContainer {
this.$video.css({ this.$video.css({
transform: flipX ? 'scaleX(-1)' : 'none' transform: flipX ? 'scaleX(-1)' : 'none'
}); });
// Reset the large video background depending on the stream.
this.setLargeVideoBackground(this.avatarDisplayed);
} }
/** /**
@ -395,8 +398,7 @@ export class VideoContainer extends LargeContainer {
// default background set. // default background set.
// In order to fix this code we need to introduce video background or // In order to fix this code we need to introduce video background or
// find a workaround for the video flickering. // find a workaround for the video flickering.
$("#largeVideoContainer").css("background", this.setLargeVideoBackground(show);
(show) ? interfaceConfig.DEFAULT_BACKGROUND : "#000");
this.$avatar.css("visibility", show ? "visible" : "hidden"); this.$avatar.css("visibility", show ? "visible" : "hidden");
this.avatarDisplayed = show; this.avatarDisplayed = show;
@ -465,4 +467,19 @@ export class VideoContainer extends LargeContainer {
stayOnStage () { stayOnStage () {
return false; return false;
} }
/**
* Sets the large video container background depending on the container
* type and the parameter indicating if an avatar is currently shown on
* large.
*
* @param {boolean} isAvatar - Indicates if the avatar is currently shown
* on the large video.
* @returns {void}
*/
setLargeVideoBackground (isAvatar) {
$("#largeVideoContainer").css("background",
(this.videoType === VIDEO_CONTAINER_TYPE && !isAvatar)
? "#000" : interfaceConfig.DEFAULT_BACKGROUND);
}
} }