Merge branch 'dev'

This commit is contained in:
N-Pex 2022-05-31 22:37:51 +02:00
commit f3999308cc
52 changed files with 2328 additions and 683 deletions

View file

@ -14,4 +14,6 @@ $chat-button-height: 50px;
$voice-recorder-color: #6f6f6f;
$voice-recording-color: red;
$voice-recorded-color: #3ae17d;
$voice-recorded-color: #3ae17d;
$poll-hilite-color: #6360f0;
$poll-hilite-color-bg: #d6d5fc;

View file

@ -119,7 +119,7 @@ $admin-fg: white;
padding: 10px;
background-color: #f2f2f2;
}
.chat-content {
margin: 0;
padding-top: $chat-standard-padding-s;
@ -596,16 +596,9 @@ $admin-fg: white;
position: absolute;
width: fit-content;
background-color: white;
height: 44px;
height: 34px;
border-radius: 22px;
box-shadow: 4px 4px 8px rgba(0,0,0,0.15);
// &.incoming {
// right: 30%;
// }
// &.outgoing {
// left: unset !important;
// right: 10px !important;
// }
}
.avatar-operations {
@ -618,6 +611,10 @@ $admin-fg: white;
box-shadow: 4px 4px 8px rgba(0,0,0,0.15);
}
.send-options {
z-index: 11; // Above mic button
}
.message-operations-picker {
background-color: white;
text-align: center;
@ -1140,4 +1137,9 @@ $admin-fg: white;
.loading-indicator {
position: absolute;
background-color: rgba(0, 0, 0, 0.2);
}
.exporting-indicator {
position: absolute;
background-color: white;
}

View file

@ -0,0 +1,116 @@
.poll-bubble {
width: 70%;
}
.poll-bubble {
color: black;
padding: $chat-standard-padding-s !important;
font-family: "Inter", sans-serif;
font-size: 16 * $chat-text-size;
line-height: 16 * $chat-text-size;
}
.from-admin .poll-bubble {
color: rgba(white, 0.9);
}
.poll-icon {
path {
fill: currentColor;
}
}
.poll-check-icon {
width: 14.18px;
height: 12px;
}
.poll-question {
font-weight: 700;
margin-top: $chat-standard-padding-xs;
margin-bottom: $chat-standard-padding-s;
}
.poll-answer {
border: 1px solid currentColor;
border-radius: 4px;
padding: 15px 14px;
margin: 0px;
&.winner {
font-weight: 700;
}
&.selected {
border: 1px solid $poll-hilite-color;
background-color: $poll-hilite-color-bg;
color: #1d1d1d;
font-weight: 700;
}
&.result {
border: none;
padding: 15px 0px;
}
.poll-answer-title {
}
.poll-answer-num-votes {
font-size: 0.75rem;
}
justify-content: space-between;
position: relative;
}
.poll-percent-indicator {
position: absolute;
bottom: 2px;
left: 0px;
right: 0px;
height: 8px;
margin-top: 4px;
.bar {
background-color: #7e7cf8;
position: absolute;
bottom: 0px;
left: 0px;
top: 0px;
border-radius: 4px;
}
}
.poll-status {
justify-content: space-between;
font-size: 13px;
line-height: 117%;
margin: 0px;
.poll-status-title {
}
.poll-status-close {
color: $poll-hilite-color;
}
}
.poll-submit {
.v-btn {
font-family: "Inter", sans-serif;
font-weight: 700;
font-size: 11 * $chat-text-size;
color: white;
text-transform: uppercase;
background-color: $poll-hilite-color !important;
border: 1px solid black;
border-radius: 21px !important;
height: 42px !important;
margin-top: $chat-standard-padding-xs;
margin-bottom: $chat-standard-padding-xs;
}
}
// Creation dialog
//
.poll-create-dialog-content {
max-height: 50vh;
overflow-x: hidden;
overflow-y: auto;
}
.poll-create-status {
font-size: 0.7rem;
}

View file

@ -37,12 +37,6 @@
background: white;
box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.08);
.join-user-info {
display: flex;
flex-wrap: nowrap;
max-width: 500px;
}
@media #{map-get($display-breakpoints, 'sm-and-down')} {
padding: 20px;
}

View file

@ -1,6 +1,7 @@
#EmojiPicker {
width: 100%;
background-color: #ffffff;
margin-top: 15px;
.container-emoji {
height: 60vh;

View file

@ -0,0 +1,6 @@
<template>
<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#757575">
<rect fill="none" height="24" width="24"/>
<path d="M18,9V7h-2V2.84C14.77,2.3,13.42,2,11.99,2C6.47,2,2,6.48,2,12s4.47,10,9.99,10C17.52,22,22,17.52,22,12 c0-1.05-0.17-2.05-0.47-3H18z M15.5,8C16.33,8,17,8.67,17,9.5S16.33,11,15.5,11S14,10.33,14,9.5S14.67,8,15.5,8z M8.5,8 C9.33,8,10,8.67,10,9.5S9.33,11,8.5,11S7,10.33,7,9.5S7.67,8,8.5,8z M12,17.5c-2.33,0-4.31-1.46-5.11-3.5h10.22 C16.31,16.04,14.33,17.5,12,17.5z M22,3h2v2h-2v2h-2V5h-2V3h2V1h2V3z"/>
</svg>
</template>

View file

@ -0,0 +1,3 @@
<svg width="15" height="12" viewBox="0 0 15 12" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.9265 0.278549C13.6041 -0.0706278 13.0413 -0.0953257 12.6944 0.225985L4.74201 7.59645C4.66894 7.6675 4.55947 7.67068 4.48341 7.6057L2.44807 5.93997C2.20767 5.74531 1.92476 5.64018 1.62665 5.64018C1.22503 5.64018 0.844759 5.83181 0.586146 6.15932L0.321439 6.49622C-0.153089 7.10185 -0.095373 7.992 0.449243 8.52339L3.64365 11.6229C3.89315 11.8671 4.2187 12 4.55335 12C4.93661 12 5.30168 11.827 5.5603 11.521L13.9508 1.5886C14.2672 1.21487 14.2581 0.64014 13.9265 0.278521L13.9265 0.278549Z" fill="black"/>
</svg>

After

Width:  |  Height:  |  Size: 620 B

View file

@ -0,0 +1,6 @@
<svg width="17" height="19" viewBox="0 0 17 19" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3.31462 16.4718C3.31462 16.9496 3.70026 17.3368 4.17609 17.3368L16.1385 17.3368C16.6144 17.3368 17 16.9496 17 16.4718L16.9998 13.6229C16.9998 13.1452 16.6142 12.7579 16.1383 12.7579L4.1764 12.7579C3.70056 12.7579 3.31492 13.1452 3.31492 13.6229L3.31512 16.4718L3.31462 16.4718Z" fill="white"/>
<path d="M3.31462 10.4557C3.31462 10.9335 3.70026 11.3208 4.17609 11.3208L11.3428 11.3208C11.8186 11.3208 12.2043 10.9335 12.2043 10.4557L12.2043 7.60711C12.2043 7.12931 11.8186 6.74208 11.3428 6.74208L4.17609 6.74208C3.70026 6.74208 3.31462 7.12932 3.31462 7.60711L3.31462 10.4557Z" fill="white"/>
<path d="M3.31451 1.59127L3.31451 4.44011C3.31451 4.91791 3.70016 5.30514 4.17598 5.30514L6.99509 5.30514C7.47093 5.30514 7.85657 4.91791 7.85657 4.44011L7.85637 1.59127C7.85637 1.11347 7.47073 0.726242 6.9949 0.726242L4.17599 0.726242C3.70035 0.726242 3.31452 1.11348 3.31452 1.59127L3.31451 1.59127Z" fill="white"/>
<path d="M-2.00529e-05 0.587841L-2.0791e-05 17.4747C-2.08052e-05 17.7995 0.262306 18.0625 0.585404 18.0625L1.38198 18.0625C1.70528 18.0625 1.96741 17.7995 1.96741 17.4747L1.96741 0.587841C1.96741 0.263208 1.70508 -1.14667e-08 1.38198 -2.55897e-08L0.585405 -6.04092e-08C0.261911 -7.45496e-08 -2.00387e-05 0.263213 -2.00529e-05 0.587841Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

View file

@ -69,7 +69,8 @@
"new_room": "ཁ་བརྡ་ཁང་གསར་པ།",
"name_room": "ཁ་བརྡ་ཁང་ལ་མིང་ཐོགས།",
"room_topic": "གལ་ཏེ་འདོད་པ་ཡོད་ན། ཚོགས་པའི་སྐོར་གྱི་འགྲེལ་བཤད་ཐུང་ངུ་ཞིག་འབྲི་ཆོག",
"create": "བཟོས།"
"create": "བཟོས།",
"room_name_limit_error_msg": ""
},
"menu": {
"logout": "ཕྱིར་ཐོན།",
@ -222,7 +223,8 @@
"remember_me": "ང་དྲན་པར་བྱོས།",
"user_name_label": "སྤྱོད་མིང་།",
"title": "ཁྱེད་རང་ནང་དུ་ཞུགས་པར་དགའ་བསུ་ཞུ།",
"join_failed": "ཁ་བརྡ་ཁང་དུ་འཛུལ་ཐུབ་མ་སོང་།"
"join_failed": "ཁ་བརྡ་ཁང་དུ་འཛུལ་ཐུབ་མ་སོང་།",
"choose_name": ""
},
"profile_info_popup": {
"powered_by": "ཁ་བརྡ་ཁང་འདི་{product} ནུས་ཤུགས་བསྩལ་ཡོད། {productLink} ནས་དེ་ལས་མང་བ་སྦྱོང་ཆོག་ལ། མདུན་དུ་བསྐྱོད་དེ་ཁ་བརྡ་ཁང་གཞན་ཞིག་བསྐྲུན་ཆོག",

View file

@ -94,7 +94,8 @@
"create": "Erstellen",
"next": "Nächste",
"name_room": "Raum benennen",
"room_topic": "Füge eine Beschreibung hinzu, wenn du möchtest"
"room_topic": "Füge eine Beschreibung hinzu, wenn du möchtest",
"room_name_limit_error_msg": ""
},
"device_list": {
"title": "GERÄTE",
@ -144,7 +145,8 @@
"status_logging_in": "Wird angemeldet …",
"status_joining": "Raum beitreten …",
"join_failed": "Beitritt zum Raum fehlgeschlagen.",
"title": "Willkommen in {roomName}"
"title": "Willkommen in {roomName}",
"choose_name": ""
},
"invite": {
"title": "Freunde hinzufügen",

View file

@ -90,7 +90,7 @@
"new_room": "New Room",
"create": "Create",
"next": "Next",
"name_room": "Name room",
"name_room": "Room name",
"room_topic": "Add a description if you like",
"join_permissions": "Join permissions",
"set_join_permissions": "Set Join Permissions",
@ -104,7 +104,8 @@
"invite_description": "Choose from a list or search by account ID",
"status_creating": "Creating room",
"status_avatar_total": "Uploading avatar: {count} of {total}",
"status_avatar": "Uploading avatar: {count}"
"status_avatar": "Uploading avatar: {count}",
"room_name_limit_error_msg": "Maximum 50 characters allowed"
},
"device_list": {
"title": "DEVICES",
@ -158,7 +159,8 @@
"enter_room": "Enter room",
"status_logging_in": "Logging in...",
"status_joining": "Joining room...",
"join_failed": "Failed to join room."
"join_failed": "Failed to join room.",
"choose_name": "Choose a name to use"
},
"invite": {
"title": "Add Friends",
@ -208,7 +210,8 @@
"show_all": "Show all >",
"leave_room": "Leave",
"version_info": "Powered by Guardian Project. Version: {version}",
"scan_code": "Scan to join the room"
"scan_code": "Scan to join the room",
"export_room": "Export chat"
},
"room_info_sheet": {
"this_room": "This room",
@ -233,5 +236,34 @@
"video_file": "Video file",
"original_text": "<original text>",
"download_name": "Download"
},
"poll_create": {
"title": "Create poll",
"intro": "Please fill in details below.",
"create": "Create",
"creating": "Creating poll",
"poll_disclosed": "Open - current results are shown at all times.",
"poll_undisclosed": "Closed - users will see the results when poll is closed.",
"add_answer": "Add answer",
"failed": "Failed to create poll, please try again later.",
"question_label": "Type your question here",
"question_required": "You need to enter a question!",
"answer_label": "Answer no {index}",
"answer_required": "Answer can't be empty. Please enter some text or remove this option.",
"create_poll_menu_option": "Create poll",
"poll_status_closed": "Poll is closed",
"poll_status_disclosed": "Results will be shown when poll is closed.",
"poll_status_open": "Poll is open",
"poll_status_open_not_voted": "Poll is open - vote to see the results",
"close_poll": "Close poll",
"poll_submit": "Submit",
"num_answered": "{count} have answered"
},
"export": {
"exported_date": "Exported on {date}",
"fetched_n_events": "Fetched {count} events",
"fetched_n_of_total_events": "Fetched {count} of {total} events",
"processed_n_of_total_events": "Processed media for {count} of {total} events",
"export_filename": "Exported chat {date}"
}
}

View file

@ -63,7 +63,8 @@
"remember_me": "Recordarme",
"user_name_label": "Nombre de usuario",
"title": "Bienvenido has sido invitado a unirte",
"join_failed": "No se pudo unir a la sala."
"join_failed": "No se pudo unir a la sala.",
"choose_name": ""
},
"profile": {
"display_name": "Nombre para mostrar",
@ -117,7 +118,8 @@
"done": "Listo",
"new_room": "Nueva Sala",
"create": "Crear",
"room_topic": "Añade una descripción si quieres"
"room_topic": "Añade una descripción si quieres",
"room_name_limit_error_msg": ""
},
"room_welcome": {
"join_public": "Cualquiera puede unirse abriendo este vínculo: {link}",

View file

@ -27,7 +27,8 @@
"room_topic": "Lisää kuvaus, jos haluat",
"add_people": "Lisää ihmisiä",
"link_copied": "Linkki kopioitu!",
"public_info": "Kuka tahansa, jolla on linkki"
"public_info": "Kuka tahansa, jolla on linkki",
"room_name_limit_error_msg": ""
},
"purge_room": {
"n_seconds": "{seconds} sekuntia",
@ -72,7 +73,8 @@
"user_name_label": "Käyttäjätunnus",
"status_joining": "Liittyminen huoneeseen…",
"status_logging_in": "Kirjautuminen sisään…",
"join_failed": "Huoneeseen liittyminen epäonnistui."
"join_failed": "Huoneeseen liittyminen epäonnistui.",
"choose_name": ""
},
"leave": {
"title_public": "Näkemiin, {user}",

View file

@ -94,7 +94,8 @@
"get_link": "Obtenir le lien",
"public_info": "Quiconque avec un lien",
"join_permissions_info": "Ces autorisations déterminent comment les personnes peuvent rejoindre le salon et avec quelle facilité dautres personnes peuvent être invitées. Elles peuvent être modifiées à tout moment.",
"status_creating": "Création du salon"
"status_creating": "Création du salon",
"room_name_limit_error_msg": ""
},
"device_list": {
"title": "APPAREILS",
@ -144,7 +145,8 @@
"status_joining": "Adhésion au salon…",
"join_failed": "Impossible de rejoindre le salon.",
"joining_as": "Vous rejoignez en tant que :",
"join_guest": "Rejoindre comme invité·e"
"join_guest": "Rejoindre comme invité·e",
"choose_name": ""
},
"invite": {
"title": "Ajouter des amis",

View file

@ -93,7 +93,8 @@
"new_room": "Nuova stanza",
"invite_info": "Solo le persone aggiunte",
"join_permissions_info": "Questi permessi determinano come le persone possono entrare nella stanza e quanto facilmente gli altri possono essere invitati. Possono essere cambiati in qualsiasi momento.",
"public_info": "Chiunque abbia un collegamento"
"public_info": "Chiunque abbia un collegamento",
"room_name_limit_error_msg": ""
},
"device_list": {
"title": "DISPOSITIVI",
@ -143,7 +144,8 @@
"join_guest": "Unisciti come ospite",
"status_joining": "Unendosi alla stanza…",
"join_failed": "Impossibile unirsi alla stanza.",
"status_logging_in": "Accesso in corso…"
"status_logging_in": "Accesso in corso…",
"choose_name": ""
},
"invite": {
"title": "Aggiungi amici",

View file

@ -75,7 +75,8 @@
"status_joining": "Tar del i rom…",
"status_logging_in": "Logger inn …",
"enter_room": "",
"title": "Velkommen til {roomName}"
"title": "Velkommen til {roomName}",
"choose_name": ""
},
"profile_info_popup": {
"identity_temporary": "{displayName}",
@ -113,7 +114,8 @@
"link_copied": "Lenke kopiert.",
"next": "Neste",
"create": "Opprett",
"new_room": "Nytt rom"
"new_room": "Nytt rom",
"room_name_limit_error_msg": ""
},
"room_welcome": {
"room_history_is": "Romhistorikken er {type}.",

View file

@ -117,7 +117,8 @@
"invite_description": "Escolha numa lista ou busque pelo ID da conta",
"status_creating": "Criando a sala",
"status_avatar_total": "Enviando o avatar: {count} de {total}",
"status_avatar": "Enviando avatar: {count}"
"status_avatar": "Enviando avatar: {count}",
"room_name_limit_error_msg": ""
},
"device_list": {
"title": "DISPOSITIVOS",
@ -171,7 +172,8 @@
"enter_room": "Entre na sala",
"status_logging_in": "Fazendo login...",
"status_joining": "Entrando na sala...",
"join_failed": "Houve uma falha ao entrar na sala."
"join_failed": "Houve uma falha ao entrar na sala.",
"choose_name": ""
},
"leave": {
"title_public": "Adeus, {user}",

View file

@ -99,7 +99,8 @@
"joining_as": "Vă înscrieți ca:",
"remember_me": "Amintește-ți de mine",
"user_name_label": "Numele utilizatorului",
"title": "Bine ați venit, ați fost invitat să vă alăturați"
"title": "Bine ați venit, ați fost invitat să vă alăturați",
"choose_name": ""
},
"profile_info_popup": {
"new_room": "+ Cameră nouă",
@ -162,7 +163,8 @@
"name_room": "Nume cameră",
"next": "Următorul",
"create": "Creați",
"new_room": "Cameră nouă"
"new_room": "Cameră nouă",
"room_name_limit_error_msg": ""
},
"room_welcome": {
"got_it": "L-am prins",

View file

@ -83,7 +83,8 @@
"name_room": "مۇنازىرەخانىغا ئىسىم قويۇڭ",
"next": "كېيىنكى",
"create": "قۇرۇش",
"new_room": "يېڭى مۇنازىرەخانا"
"new_room": "يېڭى مۇنازىرەخانا",
"room_name_limit_error_msg": ""
},
"room": {
"purge_failed": "مۇنازىرەخانىنى يۇيۇش مەغلۇب بولدى!",
@ -114,7 +115,8 @@
"joining_as": "سىز تۆۋەندىكىدەك قاتنىشىۋاتىسىز:",
"remember_me": "",
"user_name_label": "قوللانغۇچى ئىسمى",
"title": "{ياتاق ئىسمى} غا خۇش كەپسىز"
"title": "{ياتاق ئىسمى} غا خۇش كەپسىز",
"choose_name": ""
},
"room_welcome": {
"info_permissions": "ياتاق تەڭشىكىدە خالىغان ۋاقىتتا «قوشۇلۇش ئىجازەتنامىسى» نى ئۆزگەرتەلەيسىز.",

View file

@ -174,7 +174,8 @@
"remember_me": "记得我",
"user_name_label": "用户名",
"title": "欢迎您被邀请加入",
"join_failed": "加入聊天室失败。"
"join_failed": "加入聊天室失败。",
"choose_name": ""
},
"profile": {
"display_name": "显示名称",
@ -211,7 +212,8 @@
"done": "完毕",
"new_room": "新的聊天室",
"room_topic": "如果您愿意,请添加说明",
"create": "创建"
"create": "创建",
"room_name_limit_error_msg": ""
},
"room_welcome": {
"got_it": "知道了",