mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
Merge remote-tracking branch 'origin/chat' into chat
# Conflicts: # gui/preload-chat.js # gui/src/chat-module.html
This commit is contained in:
commit
104b3d31d9
2 changed files with 628 additions and 623 deletions
|
@ -1876,10 +1876,8 @@ async function updateAllChat(clear) {
|
|||
.then(async function (result) {
|
||||
// handle result async
|
||||
//document.getElementById("blurOverlay").classList.add("bg-primary");
|
||||
document.getElementById("blurOverlay").style.webkitFilter = "blur(10px)";
|
||||
|
||||
|
||||
|
||||
document.getElementById("blurOverlay").style.webkitFilter =
|
||||
"blur(10px)";
|
||||
|
||||
if (typeof result !== "undefined") {
|
||||
for (const item of result.docs) {
|
||||
|
@ -1894,11 +1892,13 @@ async function updateAllChat(clear) {
|
|||
}
|
||||
}
|
||||
|
||||
}
|
||||
)
|
||||
document.getElementById("blurOverlay").style.webkitFilter =
|
||||
"blur(0px)";
|
||||
})
|
||||
.catch(function (err) {
|
||||
console.log(err);
|
||||
|
||||
document.getElementById("blurOverlay").style.webkitFilter =
|
||||
"blur(0px)";
|
||||
});
|
||||
})
|
||||
.catch(function (err) {
|
||||
|
|
|
@ -46,6 +46,7 @@
|
|||
data-source="../node_modules/emoji-picker-element-data/en/emojibase/data.json"
|
||||
></emoji-picker>
|
||||
</div>
|
||||
<div id="blurOverlay" style="-webkit-filter: blur(0px); filter: blur(10px)">
|
||||
<div class="container-fluid">
|
||||
<div class="row h-100">
|
||||
<div class="col-4 p-2">
|
||||
|
@ -241,7 +242,10 @@
|
|||
>
|
||||
<i class="bi bi-three-dots-vertical"></i>
|
||||
</button>
|
||||
<ul class="dropdown-menu" aria-labelledby="chatSettingsDropDown">
|
||||
<ul
|
||||
class="dropdown-menu"
|
||||
aria-labelledby="chatSettingsDropDown"
|
||||
>
|
||||
<li>
|
||||
<a
|
||||
class="dropdown-item bg-danger text-white"
|
||||
|
@ -708,5 +712,6 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
Loading…
Reference in a new issue