From f0c7e4ea8add825a8aa51574d6514e5eafb75786 Mon Sep 17 00:00:00 2001 From: Gregoire Parant Date: Wed, 16 Feb 2022 20:15:16 +0100 Subject: [PATCH 1/9] Update css warning message & add message button Signed-off-by: Gregoire Parant --- front/src/Components/Menu/MenuIcon.svelte | 16 ++++++++-------- .../WarningContainer/WarningContainer.svelte | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/front/src/Components/Menu/MenuIcon.svelte b/front/src/Components/Menu/MenuIcon.svelte index 22792702..fb057e28 100644 --- a/front/src/Components/Menu/MenuIcon.svelte +++ b/front/src/Components/Menu/MenuIcon.svelte @@ -61,15 +61,15 @@ on:dragstart|preventDefault={noDrag} on:click|preventDefault={showMenu} /> - {$LL.menu.icon.open.chat()} {/if} + {$LL.menu.icon.open.chat()} diff --git a/front/src/Components/EmbedScreens/CoWebsitesContainer.svelte b/front/src/Components/EmbedScreens/CoWebsitesContainer.svelte index 602a1625..dad86ad3 100644 --- a/front/src/Components/EmbedScreens/CoWebsitesContainer.svelte +++ b/front/src/Components/EmbedScreens/CoWebsitesContainer.svelte @@ -24,6 +24,7 @@ left: 2%; overflow-x: auto; overflow-y: hidden; + overflow: visible; &.vertical { height: auto !important; @@ -31,8 +32,6 @@ bottom: auto !important; left: auto !important; position: relative; - overflow-x: hidden; - overflow-y: auto; flex-direction: column; align-items: center; padding-top: 4px; diff --git a/front/src/Phaser/Entity/Character.ts b/front/src/Phaser/Entity/Character.ts index b411eee7..35aa3f09 100644 --- a/front/src/Phaser/Entity/Character.ts +++ b/front/src/Phaser/Entity/Character.ts @@ -95,7 +95,7 @@ export abstract class Character extends Container implements OutlineableInterfac fontFamily: '"Press Start 2P"', fontSize: "8px", strokeThickness: 2, - stroke: "gray", + stroke: "black", metrics: { ascent: 20, descent: 10, diff --git a/front/src/Phaser/Game/ActivatablesManager.ts b/front/src/Phaser/Game/ActivatablesManager.ts index 74c637d7..b41c5a72 100644 --- a/front/src/Phaser/Game/ActivatablesManager.ts +++ b/front/src/Phaser/Game/ActivatablesManager.ts @@ -13,7 +13,7 @@ export class ActivatablesManager { private canSelectByDistance: boolean = true; - private readonly outlineColor = 0xffff00; + private readonly outlineColor = 0xf9e81e; private readonly directionalActivationPositionShift = 50; constructor(currentPlayer: Player) { diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts index 2d887b2a..2b11a782 100644 --- a/front/src/Phaser/Game/GameScene.ts +++ b/front/src/Phaser/Game/GameScene.ts @@ -1687,7 +1687,7 @@ ${escapedMessage} } }); this.CurrentPlayer.on(Phaser.Input.Events.POINTER_OVER, (pointer: Phaser.Input.Pointer) => { - this.CurrentPlayer.pointerOverOutline(0x00ffff); + this.CurrentPlayer.pointerOverOutline(0x365dff); }); this.CurrentPlayer.on(Phaser.Input.Events.POINTER_OUT, (pointer: Phaser.Input.Pointer) => { this.CurrentPlayer.pointerOutOutline(); diff --git a/front/src/Phaser/Items/ActionableItem.ts b/front/src/Phaser/Items/ActionableItem.ts index ff85e232..fa7a87dc 100644 --- a/front/src/Phaser/Items/ActionableItem.ts +++ b/front/src/Phaser/Items/ActionableItem.ts @@ -56,7 +56,7 @@ export class ActionableItem implements ActivatableInterface { this.getOutlinePlugin()?.add(this.sprite, { thickness: 2, - outlineColor: 0xffff00, + outlineColor: 0xf9e81e, }); } From 070ad6b9931a33e192d6733c97701796010d5861 Mon Sep 17 00:00:00 2001 From: Gregoire Parant Date: Sun, 20 Feb 2022 23:38:20 +0100 Subject: [PATCH 7/9] Add jiti logo for Jitsi button meeting --- front/dist/resources/logos/meet.svg | 49 --- .../CoWebsiteThumbnailSlot.svelte | 303 +++++++++--------- 2 files changed, 150 insertions(+), 202 deletions(-) delete mode 100644 front/dist/resources/logos/meet.svg diff --git a/front/dist/resources/logos/meet.svg b/front/dist/resources/logos/meet.svg deleted file mode 100644 index 787134e1..00000000 --- a/front/dist/resources/logos/meet.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte b/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte index 4c0c3793..ecd62b71 100644 --- a/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte +++ b/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte @@ -21,7 +21,7 @@ onMount(() => { icon.src = isJitsi - ? "/resources/logos/meet.svg" + ? "/resources/logos/jitsi.png" : `${ICON_URL}/icon?url=${coWebsite.getUrl().hostname}&size=64..96..256&fallback_icon_color=14304c`; icon.alt = coWebsite.getUrl().hostname; icon.onload = () => { @@ -190,171 +190,168 @@ -
- +
+

Open / Close Jitsi meeting!

-
From 0943ec89915d9341f04eb1caab34982e8804412a Mon Sep 17 00:00:00 2001 From: Gregoire Parant Date: Mon, 21 Feb 2022 01:09:53 +0100 Subject: [PATCH 8/9] Define color text by brightness Signed-off-by: Gregoire Parant --- .../EmbedScreens/CoWebsiteThumbnailSlot.svelte | 9 +++++---- .../Video/ScreenSharingMediaBox.svelte | 6 ++++-- .../src/Components/Video/VideoMediaBox.svelte | 6 ++++-- front/src/Components/Video/utils.ts | 18 ++++++++++++++++++ front/src/Phaser/Entity/Character.ts | 2 +- 5 files changed, 32 insertions(+), 9 deletions(-) diff --git a/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte b/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte index ecd62b71..d8431704 100644 --- a/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte +++ b/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte @@ -326,8 +326,6 @@ } &.jitsi { - filter: invert(100%); - -webkit-filter: invert(100%); padding: 7px; } } @@ -343,15 +341,18 @@ display: none; position: absolute; background-color: rgba(0, 0, 0, 0.6); - top: -30px; + top: -40px; left: -4px; width: 0 !important; min-height: 20px; transition: all 0.2s ease; overflow: hidden; color: white; - padding: 2px; + padding: 4px; border-radius: 4px; + p { + margin-bottom: 0; + } } } diff --git a/front/src/Components/Video/ScreenSharingMediaBox.svelte b/front/src/Components/Video/ScreenSharingMediaBox.svelte index d7609421..73fb792e 100644 --- a/front/src/Components/Video/ScreenSharingMediaBox.svelte +++ b/front/src/Components/Video/ScreenSharingMediaBox.svelte @@ -4,13 +4,15 @@ import type { Streamable } from "../../Stores/StreamableCollectionStore"; import type { ScreenSharingPeer } from "../../WebRtc/ScreenSharingPeer"; - import { getColorByString, srcObject } from "./utils"; + import { getColorByString, srcObject, getTextColorByBackgroundColor } from "./utils"; export let clickable = false; export let peer: ScreenSharingPeer; let streamStore = peer.streamStore; let name = peer.userName; + let backGroundColor = getColorByString(peer.userName); + let textColor = getTextColorByBackgroundColor(backGroundColor); let statusStore = peer.statusStore; let embedScreen: EmbedScreen; @@ -32,7 +34,7 @@ {/if} {#if $streamStore !== null} - {name} + {name}