diff --git a/install/package.json b/install/package.json index 3989c6edde..cc1e4aaa04 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", @@ -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", 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 @@
-
    +