From 1b93bf666f7f0be2d16004e10998bbf8b65fd77e Mon Sep 17 00:00:00 2001 From: Alexis Faizeau Date: Thu, 3 Feb 2022 14:38:53 +0100 Subject: [PATCH 1/3] Remove translate from warning message --- front/src/Components/WarningContainer/WarningContainer.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/front/src/Components/WarningContainer/WarningContainer.svelte b/front/src/Components/WarningContainer/WarningContainer.svelte index dd740eb5..d72e7497 100644 --- a/front/src/Components/WarningContainer/WarningContainer.svelte +++ b/front/src/Components/WarningContainer/WarningContainer.svelte @@ -38,7 +38,6 @@ right: 0; margin-left: auto; margin-right: auto; - transform: translate(-50%, 0); font-family: Lato; min-width: 300px; opacity: 0.9; From b91de4a91d18b3f44b1f6ecf4f78c4e328d689f8 Mon Sep 17 00:00:00 2001 From: Alexis Faizeau Date: Thu, 3 Feb 2022 15:02:58 +0100 Subject: [PATCH 2/3] Replace favicon by meet icon on jitsi cowebsite thumbnail --- front/dist/resources/logos/meet.svg | 49 +++++++++++++++++++ .../CoWebsiteThumbnailSlot.svelte | 11 ++++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 front/dist/resources/logos/meet.svg diff --git a/front/dist/resources/logos/meet.svg b/front/dist/resources/logos/meet.svg new file mode 100644 index 00000000..787134e1 --- /dev/null +++ b/front/dist/resources/logos/meet.svg @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte b/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte index e5c3c22e..3bd130f5 100644 --- a/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte +++ b/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte @@ -19,7 +19,9 @@ const urlObject = new URL(coWebsiteUrl); onMount(() => { - icon.src = `${ICON_URL}/icon?url=${urlObject.hostname}&size=64..96..256&fallback_icon_color=14304c`; + icon.src = coWebsite.jitsi + ? "/resources/logos/meet.svg" + : `${ICON_URL}/icon?url=${urlObject.hostname}&size=64..96..256&fallback_icon_color=14304c`; icon.alt = coWebsite.altMessage ?? urlObject.hostname; icon.onload = () => { iconLoaded = true; @@ -79,6 +81,7 @@ From 137bd831a9093e9e05b8447688c182db505d4117 Mon Sep 17 00:00:00 2001 From: Alexis Faizeau Date: Thu, 3 Feb 2022 15:20:30 +0100 Subject: [PATCH 3/3] Fix main cowebsite switcher --- front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte b/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte index 3bd130f5..809d1985 100644 --- a/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte +++ b/front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte @@ -36,7 +36,7 @@ const coWebsites = $coWebsitesNotAsleep; const newMain = $highlightedEmbedScreen ?? coWebsites.length > 1 ? coWebsites[1] : undefined; if (newMain) { - coWebsiteManager.goToMain(coWebsite); + coWebsiteManager.goToMain(newMain); } } else { highlightedEmbedScreen.toggleHighlight({