From 98ff47ec08bee547348e76bf7970a4358ffc7677 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 14:40:24 -0500 Subject: [PATCH 1/4] fix(deps): update dependency winston to v3.12.0 (#12391) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 00f451e76e..94e96c37db 100644 --- a/install/package.json +++ b/install/package.json @@ -145,7 +145,7 @@ "validator": "13.11.0", "webpack": "5.90.3", "webpack-merge": "5.10.0", - "winston": "3.11.0", + "winston": "3.12.0", "workerpool": "9.1.0", "xml": "1.0.1", "xregexp": "5.1.1", From 4d18c38b086b67a3bd1a826849ced2a9126e7670 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 14:40:33 -0500 Subject: [PATCH 2/4] fix(deps): update dependency nodebb-plugin-mentions to v4.4.1 (#12393) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 94e96c37db..0b2d38bd58 100644 --- a/install/package.json +++ b/install/package.json @@ -99,7 +99,7 @@ "nodebb-plugin-emoji": "5.1.13", "nodebb-plugin-emoji-android": "4.0.0", "nodebb-plugin-markdown": "12.2.6", - "nodebb-plugin-mentions": "4.4.0", + "nodebb-plugin-mentions": "4.4.1", "nodebb-plugin-ntfy": "1.7.3", "nodebb-plugin-spam-be-gone": "2.2.1", "nodebb-rewards-essentials": "1.0.0", From 8d6ef3d50a26dd335d31d797ebeb003f8c89f8c5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 14:40:42 -0500 Subject: [PATCH 3/4] fix(deps): update fontsource monorepo (#12390) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index 0b2d38bd58..0a8025d684 100644 --- a/install/package.json +++ b/install/package.json @@ -29,8 +29,8 @@ }, "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", - "@fontsource/inter": "5.0.16", - "@fontsource/poppins": "5.0.8", + "@fontsource/inter": "5.0.17", + "@fontsource/poppins": "5.0.12", "@fortawesome/fontawesome-free": "6.5.1", "@isaacs/ttlcache": "1.4.1", "@popperjs/core": "2.11.8", From 4f6a7ffe010d06021e5ee49e58e7843664823805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 7 Mar 2024 18:32:46 -0500 Subject: [PATCH 4/4] scrollbar css --- public/scss/admin/admin.scss | 1 + public/scss/client.scss | 3 ++- public/scss/modules/scrollbar.scss | 19 +++++++++++++++++++ src/views/chats.tpl | 4 ++-- src/views/partials/chats/message-window.tpl | 2 +- 5 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 public/scss/modules/scrollbar.scss diff --git a/public/scss/admin/admin.scss b/public/scss/admin/admin.scss index 2cf8d3b4bf..2d9295d128 100644 --- a/public/scss/admin/admin.scss +++ b/public/scss/admin/admin.scss @@ -18,6 +18,7 @@ @import "settings"; @import "../modules/alerts"; +@import "../modules/scrollbar.scss"; @import "./modules/selectable"; @import "./modules/nprogress"; @import "./modules/search"; diff --git a/public/scss/client.scss b/public/scss/client.scss index 3bcd1bd080..cc2debfe86 100644 --- a/public/scss/client.scss +++ b/public/scss/client.scss @@ -7,4 +7,5 @@ @import "modules/picture-switcher"; @import "modules/bottom-sheet"; @import "modules/icon-picker"; -@import "modules/alerts.scss"; \ No newline at end of file +@import "modules/alerts.scss"; +@import "modules/scrollbar.scss"; \ No newline at end of file diff --git a/public/scss/modules/scrollbar.scss b/public/scss/modules/scrollbar.scss new file mode 100644 index 0000000000..47b90c4a4e --- /dev/null +++ b/public/scss/modules/scrollbar.scss @@ -0,0 +1,19 @@ +.ghost-scrollbar { + &::-webkit-scrollbar { + width: 10px; + + } + + &::-webkit-scrollbar-track { + border-radius: 8px; + background-color: $gray-200; + border: none; + } + + &::-webkit-scrollbar-thumb { + border-radius: 8px; + border: 2px solid transparent; + background-clip: content-box; + background-color: $gray-500; + } +} \ No newline at end of file diff --git a/src/views/chats.tpl b/src/views/chats.tpl index 06481d7642..3ffc290ae4 100644 --- a/src/views/chats.tpl +++ b/src/views/chats.tpl @@ -34,7 +34,7 @@
- {{{ if publicRooms.length }}} + {{{ if rooms.length }}}
@@ -42,7 +42,7 @@
{{{ end }}} -
+
{{{ each rooms }}} {{{ end }}} diff --git a/src/views/partials/chats/message-window.tpl b/src/views/partials/chats/message-window.tpl index 26c95c3d9a..4f5e99c9f1 100644 --- a/src/views/partials/chats/message-window.tpl +++ b/src/views/partials/chats/message-window.tpl @@ -24,7 +24,7 @@
-
    +