_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Components/Menu/Menu.svelte
#	front/src/Components/Menu/ProfileSubMenu.svelte
#	front/src/Components/Menu/SettingsSubMenu.svelte
#	front/src/Connexion/ConnectionManager.ts
#	front/src/Stores/MediaStore.ts
#	front/src/Stores/MenuStore.ts
#	front/style/TextGlobalMessageSvelte-Style.scss
#	front/style/style.scss
This commit is contained in:
Gregoire Parant
2021-09-08 18:20:13 +02:00
parent 2ea7b0cff1 6cf86ec8dc
commit 3a3e5d5f3b
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front/style/style.scss
+1 -1
View File
@@ -1090,7 +1090,7 @@ div.is-silent {
border-radius: 15px 15px 15px 15px;
max-height: 20%;
transition: right 350ms;
right: -20vw;
right: -300px;
background-color: black;
font-size: 20px;
color: white;