_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:thecodingmachine/workadventure

Browse Source
This commit is contained in:
_Bastler
2022-01-29 14:36:47 +01:00
parent 54f936860b 462cb53101
commit ab470ab18d
10 changed files with 84 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front/src/Components/Video/ScreenSharingMediaBox.svelte
+9 -3
View File
@@ -30,10 +30,11 @@
{#if $statusStore === "error"}
<div class="rtc-error" />
{/if}
{#if $streamStore === null}
<i style="background-color: {getColorByString(name)};">{name}</i>
{:else}
{#if $streamStore !== null}
<!-- svelte-ignore a11y-media-has-caption -->
<i class="container">
<span style="background-color: {getColorByString(name)};">{name}</span>
</i>
<video
use:srcObject={$streamStore}
autoplay
@@ -48,5 +49,10 @@
video {
width: 100%;
}
i {
span {
padding: 2px 32px;
}
}
}
</style>
front/src/Components/Video/VideoMediaBox.svelte
+5 -24
View File
@@ -58,15 +58,12 @@
<div class="rtc-error" />
{/if}
<!-- {#if !$constraintStore || $constraintStore.video === false} -->
<i
class="container"
class:has-video={$constraintStore && $constraintStore.video === true}
class:minimized={(!$constraintStore || $constraintStore.video !== true) && minimized}
style="background-color: {getColorByString(name)};"
>
<span style="noselect">{peer.userName}</span>
<div class="woka-icon"><Woka userId={peer.userId} placeholderSrc={""} /></div>
<i class="container">
<span style="background-color: {getColorByString(name)};">{name}</span>
</i>
<div class="woka-icon {($constraintStore && $constraintStore.video !== false) || minimized ? '' : 'no-video'}">
<Woka userId={peer.userId} placeholderSrc={""} />
</div>
<!-- {/if} -->
{#if $constraintStore && $constraintStore.audio === false}
<img
@@ -99,22 +96,6 @@
.container {
display: flex;
flex-direction: column;
padding-top: 15px;
&.has-video {
left: auto;
transform: scale(0.5);
opacity: 0.5;
}
&.minimized {
transform: scale(0.5);
opacity: 0.5;
}
.woka-icon {
margin-right: 3px;
}
}
video.no-video {
visibility: collapse;