From 23c74bd7aafd20eb0e0f7968254c06b4233d11bb Mon Sep 17 00:00:00 2001 From: GRL Date: Mon, 7 Jun 2021 09:27:49 +0200 Subject: [PATCH 01/13] Create a PR to fix broken layout on EnableCameraScene on mobile --- front/src/Components/EnableCamera/EnableCameraScene.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/Components/EnableCamera/EnableCameraScene.svelte b/front/src/Components/EnableCamera/EnableCameraScene.svelte index 537e8bdb..effaa099 100644 --- a/front/src/Components/EnableCamera/EnableCameraScene.svelte +++ b/front/src/Components/EnableCamera/EnableCameraScene.svelte @@ -136,7 +136,7 @@ margin-top: 3vh; margin-bottom: 3vh; min-height: 10vh; - width: 50%; + width: 50vw; margin-left: auto; margin-right: auto; From e45198e4031952638772f19e4b0e1252c22be7b6 Mon Sep 17 00:00:00 2001 From: GRL Date: Mon, 7 Jun 2021 10:09:51 +0200 Subject: [PATCH 02/13] Remove marging bottom of SelectWebcamForm --- front/src/Components/EnableCamera/EnableCameraScene.svelte | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/front/src/Components/EnableCamera/EnableCameraScene.svelte b/front/src/Components/EnableCamera/EnableCameraScene.svelte index effaa099..42b58d85 100644 --- a/front/src/Components/EnableCamera/EnableCameraScene.svelte +++ b/front/src/Components/EnableCamera/EnableCameraScene.svelte @@ -134,7 +134,7 @@ section.selectWebcamForm { margin-top: 3vh; - margin-bottom: 3vh; +/* margin-bottom: 3vh;*/ min-height: 10vh; width: 50vw; margin-left: auto; @@ -158,6 +158,7 @@ } h2{ + color: pink; font-family: "Press Start 2P"; margin: 1px; } @@ -176,7 +177,7 @@ img { width: 30px; - margin-right: 10px; + margin-right: 5px; } } From cbf786fd5655b9dd227201d16c702e684a402f79 Mon Sep 17 00:00:00 2001 From: GRL Date: Mon, 7 Jun 2021 10:29:38 +0200 Subject: [PATCH 03/13] Remove img and margin --- .../src/Components/EnableCamera/EnableCameraScene.svelte | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/front/src/Components/EnableCamera/EnableCameraScene.svelte b/front/src/Components/EnableCamera/EnableCameraScene.svelte index 42b58d85..342c2a32 100644 --- a/front/src/Components/EnableCamera/EnableCameraScene.svelte +++ b/front/src/Components/EnableCamera/EnableCameraScene.svelte @@ -92,7 +92,7 @@ {#if $cameraListStore.length > 1 }
- Camera +
{#each $cameraListStore as camera} @@ -142,8 +142,8 @@ select { font-family: "Press Start 2P"; -/* margin-top: 1vh; - margin-bottom: 1vh;*/ + margin-top: 1vh; + margin-bottom: 1vh; option { font-family: "Press Start 2P"; @@ -176,7 +176,7 @@ img { width: 30px; - margin-right: 5px; + margin-right: 10px; } } @@ -210,8 +210,18 @@ align-items: center; justify-content: center; } - - } + + @media only screen and (max-width: 800px) { + * { + font-size: 80%; + } + .enableCameraScene .control-group img { + width: 15px; + margin-right: 5px; + } + } + + From 3e1f10491a4fab4ff02e3586935c5c1b342d6834 Mon Sep 17 00:00:00 2001 From: GRL Date: Mon, 7 Jun 2021 14:40:38 +0200 Subject: [PATCH 05/13] font-size reduce by 20% img width = 1vw --- .../EnableCamera/EnableCameraScene.svelte | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/front/src/Components/EnableCamera/EnableCameraScene.svelte b/front/src/Components/EnableCamera/EnableCameraScene.svelte index 0e7e84bb..ac8debc0 100644 --- a/front/src/Components/EnableCamera/EnableCameraScene.svelte +++ b/front/src/Components/EnableCamera/EnableCameraScene.svelte @@ -213,13 +213,22 @@ } @media only screen and (max-width: 800px) { - * { + .enableCameraScene h2 { font-size: 80%; } - .enableCameraScene .control-group img { - width: 15px; - margin-right: 5px; - } + + .enableCameraScene .control-group select { + font-size: 80%; + } + + .enableCameraScene button.letsgo { + font-size: 160%; + } + + .enableCameraScene .control-group img { + width: 1vw; + margin-right: 0px; + } } From 88a72e015395b8894b517136871b824f12ed2525 Mon Sep 17 00:00:00 2001 From: GRL Date: Mon, 7 Jun 2021 15:00:01 +0200 Subject: [PATCH 06/13] change width of select field --- .../src/Components/EnableCamera/EnableCameraScene.svelte | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/front/src/Components/EnableCamera/EnableCameraScene.svelte b/front/src/Components/EnableCamera/EnableCameraScene.svelte index ac8debc0..c77342bc 100644 --- a/front/src/Components/EnableCamera/EnableCameraScene.svelte +++ b/front/src/Components/EnableCamera/EnableCameraScene.svelte @@ -217,18 +217,14 @@ font-size: 80%; } - .enableCameraScene .control-group select { + .enableCameraScene .control-group .nes-select { font-size: 80%; + width: calc(100% - 50px); } .enableCameraScene button.letsgo { font-size: 160%; } - - .enableCameraScene .control-group img { - width: 1vw; - margin-right: 0px; - } } From 000be7aa499a113c9cecb9bfe3909d211bcea641 Mon Sep 17 00:00:00 2001 From: GRL Date: Mon, 7 Jun 2021 16:12:31 +0200 Subject: [PATCH 07/13] console --- front/src/Phaser/Login/EnableCameraScene.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/front/src/Phaser/Login/EnableCameraScene.ts b/front/src/Phaser/Login/EnableCameraScene.ts index ba27cd07..3468f98c 100644 --- a/front/src/Phaser/Login/EnableCameraScene.ts +++ b/front/src/Phaser/Login/EnableCameraScene.ts @@ -33,6 +33,9 @@ export class EnableCameraScene extends ResizableScene { }); enableCameraSceneVisibilityStore.showEnableCameraScene(); + + console.log('TEST'); + console.error('TEST !!!!!'); } public onResize(): void { From c9da38c7ec37b6de96268f5b2834d1669e16b576 Mon Sep 17 00:00:00 2001 From: GRL Date: Mon, 7 Jun 2021 16:23:00 +0200 Subject: [PATCH 08/13] reduce select field --- front/src/Components/EnableCamera/EnableCameraScene.svelte | 2 +- front/src/Phaser/Login/EnableCameraScene.ts | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/front/src/Components/EnableCamera/EnableCameraScene.svelte b/front/src/Components/EnableCamera/EnableCameraScene.svelte index c77342bc..8de52018 100644 --- a/front/src/Components/EnableCamera/EnableCameraScene.svelte +++ b/front/src/Components/EnableCamera/EnableCameraScene.svelte @@ -219,7 +219,7 @@ .enableCameraScene .control-group .nes-select { font-size: 80%; - width: calc(100% - 50px); + width: 50% } .enableCameraScene button.letsgo { diff --git a/front/src/Phaser/Login/EnableCameraScene.ts b/front/src/Phaser/Login/EnableCameraScene.ts index 3468f98c..ba27cd07 100644 --- a/front/src/Phaser/Login/EnableCameraScene.ts +++ b/front/src/Phaser/Login/EnableCameraScene.ts @@ -33,9 +33,6 @@ export class EnableCameraScene extends ResizableScene { }); enableCameraSceneVisibilityStore.showEnableCameraScene(); - - console.log('TEST'); - console.error('TEST !!!!!'); } public onResize(): void { From aa9c3b9f4ff5a6f732db266ea8b946c78968db88 Mon Sep 17 00:00:00 2001 From: GRL Date: Mon, 7 Jun 2021 17:18:39 +0200 Subject: [PATCH 09/13] max height on select --- .../EnableCamera/EnableCameraScene.svelte | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/front/src/Components/EnableCamera/EnableCameraScene.svelte b/front/src/Components/EnableCamera/EnableCameraScene.svelte index 8de52018..9318a1df 100644 --- a/front/src/Components/EnableCamera/EnableCameraScene.svelte +++ b/front/src/Components/EnableCamera/EnableCameraScene.svelte @@ -90,7 +90,7 @@
- {#if $cameraListStore.length > 1 } +
Camera
@@ -103,9 +103,9 @@
- {/if} +
Microphone
@@ -118,7 +118,7 @@
- {/if} +
@@ -144,12 +144,12 @@ font-family: "Press Start 2P"; margin-top: 1vh; margin-bottom: 1vh; + } - option { + option { font-family: "Press Start 2P"; } } - } section.action{ text-align: center; @@ -219,14 +219,16 @@ .enableCameraScene .control-group .nes-select { font-size: 80%; - width: 50% + } + + .enableCameraScene .control-group { + max-height: 60px; + margin-top: 10px; } .enableCameraScene button.letsgo { font-size: 160%; } } - - From a7cf0719719a37e15cbc6aaca6438790f167e544 Mon Sep 17 00:00:00 2001 From: GRL Date: Tue, 8 Jun 2021 09:10:06 +0200 Subject: [PATCH 10/13] max height on select on all device and screen --- front/src/Components/EnableCamera/EnableCameraScene.svelte | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/front/src/Components/EnableCamera/EnableCameraScene.svelte b/front/src/Components/EnableCamera/EnableCameraScene.svelte index 9318a1df..d80c4267 100644 --- a/front/src/Components/EnableCamera/EnableCameraScene.svelte +++ b/front/src/Components/EnableCamera/EnableCameraScene.svelte @@ -173,6 +173,8 @@ .control-group { display: flex; flex-direction: row; + max-height: 60px; + margin-top: 10px; img { width: 30px; @@ -221,11 +223,6 @@ font-size: 80%; } - .enableCameraScene .control-group { - max-height: 60px; - margin-top: 10px; - } - .enableCameraScene button.letsgo { font-size: 160%; } From 1cceed2fd63e788833a724a03375a1a1ddea2853 Mon Sep 17 00:00:00 2001 From: GRL Date: Tue, 8 Jun 2021 09:52:52 +0200 Subject: [PATCH 11/13] dark mode on select --- front/src/Components/EnableCamera/EnableCameraScene.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/Components/EnableCamera/EnableCameraScene.svelte b/front/src/Components/EnableCamera/EnableCameraScene.svelte index d80c4267..7f567009 100644 --- a/front/src/Components/EnableCamera/EnableCameraScene.svelte +++ b/front/src/Components/EnableCamera/EnableCameraScene.svelte @@ -93,7 +93,7 @@
Camera -
+
{#each $microphoneListStore as microphone}