Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite

This commit is contained in:
_Bastler
2022-02-23 17:07:14 +01:00
16 changed files with 58 additions and 76 deletions
@@ -23,7 +23,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 = () => {
@@ -211,6 +211,7 @@
<style lang="scss">
.cowebsite-thumbnail {
cursor: url("../../../style/images/cursor_pointer.png"), pointer;
position: relative;
padding: 0;
background-color: rgba(#000000, 0.6);
@@ -334,8 +335,6 @@
}
&.jitsi {
filter: invert(100%);
-webkit-filter: invert(100%);
padding: 7px;
}
}
@@ -350,8 +349,11 @@
left: -10px;
}
&:hover .cowebsite-thumbnail-hint {
display: inline-block;
&:hover {
.cowebsite-thumbnail-hint {
display: inline-block;
}
}
}
</style>