noby
/
workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/resizeSelect' into resizeSelect

This commit is contained in:
GRL 2021-06-02 12:00:50 +02:00
parent 5bd5245044 321fc3184a
commit 6fd119c199
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
front/src/Components/App.svelte
View File

@ -23,7 +23,7 @@
<div> <div>
{#if $loginSceneVisibleStore} {#if $loginSceneVisibleStore}
<div> <div class="scrollable">
<LoginScene game={game}></LoginScene> <LoginScene game={game}></LoginScene>
</div> </div>
{/if} {/if}
@ -43,7 +43,7 @@
</div> </div>
{/if} {/if}
{#if $enableCameraSceneVisibilityStore} {#if $enableCameraSceneVisibilityStore}
<div> <div class="scrollable">
<EnableCameraScene game={game}></EnableCameraScene> <EnableCameraScene game={game}></EnableCameraScene>
</div> </div>
{/if} {/if}

1
front/src/Components/EnableCamera/EnableCameraScene.svelte
View File

@ -131,7 +131,6 @@
pointer-events: auto; pointer-events: auto;
margin: 20px auto 0; margin: 20px auto 0;
color: #ebeeee; color: #ebeeee;
overflow: auto;
section.selectWebcamForm { section.selectWebcamForm {
margin-top: 3vh; margin-top: 3vh;

7
front/style/style.scss
View File

@ -151,6 +151,7 @@ body .message-info.warning{
} }
video.myCamVideo{ video.myCamVideo{
max-height: 20vh;
width: 15vw; width: 15vw;
-webkit-transform: scaleX(-1); -webkit-transform: scaleX(-1);
transform: scaleX(-1); transform: scaleX(-1);
@ -1222,5 +1223,11 @@ div.action.danger p.action-body{
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
& > div.scrollable {
overflow-y: auto;
-webkit-overflow-scrolling: touch;
pointer-events: auto;
}
} }
} }