diff --git a/front/dist/resources/logos/monitor-close.svg b/front/dist/resources/logos/monitor-close.svg index 80056e2d..52f446d1 100644 --- a/front/dist/resources/logos/monitor-close.svg +++ b/front/dist/resources/logos/monitor-close.svg @@ -1,44 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/front/dist/resources/logos/monitor.svg b/front/dist/resources/logos/monitor.svg index d4b586c6..be50195b 100644 --- a/front/dist/resources/logos/monitor.svg +++ b/front/dist/resources/logos/monitor.svg @@ -1,15 +1,24 @@ - - + + - + + + + + + + + + + + diff --git a/front/dist/resources/style/style.css b/front/dist/resources/style/style.css index aa4d511f..e78a195d 100644 --- a/front/dist/resources/style/style.css +++ b/front/dist/resources/style/style.css @@ -138,7 +138,7 @@ body .message-info.warning{ #div-myCamVideo { position: absolute; right: 15px; - bottom: 15px; + bottom: 30px; border-radius: 15px 15px 15px 15px; } @@ -170,7 +170,7 @@ video#myCamVideo{ background: #666; box-shadow: 2px 2px 24px #444; border-radius: 48px; - transform: translateY(40px); + transform: translateY(20px); transition-timing-function: ease-in-out; bottom: 20px; } @@ -186,7 +186,7 @@ video#myCamVideo{ .btn-cam-action div:hover{ background: #407cf7; box-shadow: 4px 4px 48px #666; - transition: 280ms; + transition: 120ms; } .btn-micro{ pointer-events: auto; diff --git a/front/src/WebRtc/MediaManager.ts b/front/src/WebRtc/MediaManager.ts index 82e8b8cf..09386970 100644 --- a/front/src/WebRtc/MediaManager.ts +++ b/front/src/WebRtc/MediaManager.ts @@ -315,12 +315,17 @@ export class MediaManager { } private enableScreenSharing() { - this.monitorClose.style.display = "none"; - this.monitor.style.display = "block"; - this.monitorBtn.classList.add("enabled"); this.getScreenMedia().then((stream) => { this.triggerStartedScreenSharingCallbacks(stream); + this.monitorClose.style.display = "none"; + this.monitor.style.display = "block"; + this.monitorBtn.classList.add("enabled"); + }, () => { + this.monitorClose.style.display = "block"; + this.monitor.style.display = "none"; + this.monitorBtn.classList.remove("enabled"); }); + } private disableScreenSharing() { diff --git a/maps/Tuto/tutoV3.json b/maps/Tuto/tutoV3.json index 9953f5a9..2ae43690 100644 --- a/maps/Tuto/tutoV3.json +++ b/maps/Tuto/tutoV3.json @@ -355,7 +355,7 @@ "value":"scriptTuto.js" }], "renderorder":"right-down", - "tiledversion":"2021.03.23", + "tiledversion":"1.5.0", "tileheight":32, "tilesets":[ {