From b38081515bea9bd9bb9a22b88c3f795f0e6bf7b7 Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Thu, 27 Jan 2022 20:10:29 +0100
Subject: [PATCH 1/2] Change style of woka and name on video container

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
---
 .../src/Components/Video/VideoMediaBox.svelte | 29 ++-------
 front/style/style.scss                        | 60 +++++++++++++++----
 2 files changed, 54 insertions(+), 35 deletions(-)

diff --git a/front/src/Components/Video/VideoMediaBox.svelte b/front/src/Components/Video/VideoMediaBox.svelte
index 2994041f..3359bc19 100644
--- a/front/src/Components/Video/VideoMediaBox.svelte
+++ b/front/src/Components/Video/VideoMediaBox.svelte
@@ -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)};">{peer.userName}</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;
diff --git a/front/style/style.scss b/front/style/style.scss
index 769d3996..a0719d55 100644
--- a/front/style/style.scss
+++ b/front/style/style.scss
@@ -38,6 +38,8 @@ body .message-info.warning{
 .video-container {
     display: flex;
     transition: all 0.2s ease;
+    background-color: #00000099;
+    border-radius: 15px;
     cursor: url('./images/cursor_pointer.png'), pointer;
     width: 100%;
 
@@ -53,32 +55,72 @@ body .message-info.warning{
         max-width: 100%;
         width: 100%;
         cursor: url('./images/cursor_pointer.png'), pointer;
+        border-radius: 15px;
 
         &.mobile{
             width: 100%;
             height: 21vh;
         }
+        &:focus{
+            outline: none;
+        }
     }
 
     i {
         position: absolute;
         width: 100px;
         height: 100px;
-        left: calc(50% - 50px);
-        top: calc(50% - 50px);
-        background-color: black;
-        border-radius: 50%;
+        left: -6px;
+        top: calc(100% - 28px);
         text-align: center;
-        font-size: 14px;
         color: white;
+        span{
+            font-size: 14px;
+            margin: 2px;
+            background-color: white;
+            border: solid 3px black;
+            border-radius: 8px;
+        }
+    }
+
+    .woka-icon{
+        position: absolute;
+        left: 90px;
+        top: calc(100% - 24px);
+        height: 23px;
         overflow: hidden;
+        border-radius: 50%;
+        transition: all 0.2s ease;
+        &.no-video{
+            left: calc(50% - 30px);
+            top: calc(50% - 30px);
+            height: auto;
+            img{
+                height: 60px;
+                width: 60px;
+            }
+        }
+        img{
+            height: 40px;
+            width: 40px;
+        }
+    }
+    &:hover{
+        .woka-icon{
+            top: calc(100% - 30px);
+            height: 30px;
+            &.no-video{
+                top: calc(100% - 32px);
+                height: 35px;
+            }
+        }
     }
 
     img {
         position: absolute;
         display: none;
-        width: 40px;
-        height: 40px;
+        width: 20px;
+        height: 20px;
         left: 5px;
         bottom: 5px;
         padding: 10px;
@@ -147,10 +189,6 @@ body .message-info.warning{
             width: 160px;
         }
     }
-
-    video:focus{
-        outline: none;
-    }
 }
 
 .sound-progress{

From 949b73d90007a4ce7ba1347bb99334bd53e21601 Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Thu, 27 Jan 2022 20:33:33 +0100
Subject: [PATCH 2/2] Fix style

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
---
 front/style/style.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/front/style/style.scss b/front/style/style.scss
index a0719d55..b3a55828 100644
--- a/front/style/style.scss
+++ b/front/style/style.scss
@@ -69,7 +69,7 @@ body .message-info.warning{
     i {
         position: absolute;
         width: 100px;
-        height: 100px;
+        height: auto;
         left: -6px;
         top: calc(100% - 28px);
         text-align: center;
@@ -80,6 +80,7 @@ body .message-info.warning{
             background-color: white;
             border: solid 3px black;
             border-radius: 8px;
+            font-style: normal;
         }
     }