зеркало из https://github.com/nextcloud/spreed.git
Merge branch 'master' of https://github.com/nextcloud/spreed
This commit is contained in:
Коммит
9ebe5fa1d6
|
@ -115,7 +115,7 @@ video {
|
|||
top: 30%;
|
||||
}
|
||||
.videoContainer.speaking .avatar-container + .nameIndicator {
|
||||
top: 55%;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.participants-1 #emptycontent {
|
||||
|
@ -143,6 +143,8 @@ video {
|
|||
height: auto;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
top: initial;
|
||||
left: initial;
|
||||
z-index: 10;
|
||||
border-top-left-radius: 3px;
|
||||
}
|
||||
|
|
|
@ -136,7 +136,7 @@
|
|||
OCA.SpreedMe.webrtc.pauseVideo();
|
||||
$this.data('title', 'Enable video').addClass('video-disabled');
|
||||
|
||||
avatarContainer.find('.avatar').avatar(OC.currentUser, 256);
|
||||
avatarContainer.find('.avatar').avatar(OC.currentUser, 128);
|
||||
avatarContainer.removeClass('hidden');
|
||||
avatarContainer.show();
|
||||
} else {
|
||||
|
|
|
@ -158,7 +158,8 @@ var spreedMappingTable = [];
|
|||
newContainer.after(
|
||||
$('<div>')
|
||||
.addClass('videoContainer videoContainer-dummy')
|
||||
.append(newContainer.find('.nameIndicator'))
|
||||
.append(newContainer.find('.nameIndicator').clone())
|
||||
.append(newContainer.find('.muteIndicator').clone())
|
||||
);
|
||||
|
||||
latestSpeakerId = id;
|
||||
|
@ -287,7 +288,7 @@ var spreedMappingTable = [];
|
|||
|
||||
// Mute indicator
|
||||
var muteIndicator = document.createElement('div');
|
||||
muteIndicator.className = 'muteIndicator icon-sound-white hidden';
|
||||
muteIndicator.className = 'muteIndicator icon-audio-white hidden';
|
||||
muteIndicator.textContent = '';
|
||||
|
||||
// Generic container
|
||||
|
@ -394,7 +395,7 @@ var spreedMappingTable = [];
|
|||
|
||||
if (data.name === 'video') {
|
||||
var avatar = $el.find('.avatar');
|
||||
avatar.avatar(spreedMappingTable[data.id], 256);
|
||||
avatar.avatar(spreedMappingTable[data.id], 128);
|
||||
|
||||
var avatarContainer = $el.find('.avatar-container');
|
||||
avatarContainer.removeClass('hidden');
|
||||
|
|
Загрузка…
Ссылка в новой задаче