Merge branch 'develop' into activitypub

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",

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";

public/scss/client.scss

@@ -7,4 +7,5 @@
 @import "modules/picture-switcher";
 @import "modules/bottom-sheet";
 @import "modules/icon-picker";
-@import "modules/alerts.scss";
+@import "modules/alerts.scss";
+@import "modules/scrollbar.scss";

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;
+	}
+}

src/views/chats.tpl

@@ -34,7 +34,7 @@
 				<hr class="my-1">
 
 				<div class="d-flex flex-column gap-1 overflow-auto">
-					{{{ if publicRooms.length }}}
+					{{{ if rooms.length }}}
 					<div class="d-flex gap-1 align-items-center justify-content-between justify-content-lg-start">
 						<button class="btn-ghost-sm p-1 order-1 order-lg-0" data-bs-toggle="collapse" data-bs-target="#private-rooms"
 						onclick="$(this).find('i').toggleClass('fa-rotate-180')"><i class="fa fa-fw fa-chevron-up" style="transition: 0.25s ease;"></i></button>
@@ -42,7 +42,7 @@
 					</div>
 					{{{ end }}}
 
-					<div id="private-rooms" component="chat/recent" class="chats-list overflow-auto mb-0 pe-1 pb-5 pb-lg-0 collapse show" data-nextstart="{nextStart}">
+					<div id="private-rooms" component="chat/recent" class="chats-list overflow-auto mb-0 pe-1 pb-5 pb-lg-0 collapse show ghost-scrollbar" data-nextstart="{nextStart}">
 						{{{ each rooms }}}
 						<!-- IMPORT partials/chats/recent_room.tpl -->
 						{{{ end }}}

src/views/partials/chats/message-window.tpl

@@ -24,7 +24,7 @@
 	<hr class="my-1"/>
 	<div class="d-flex flex-grow-1 gap-1 overflow-auto" style="min-width: 0px;">
 		<div component="chat/messages" class="expanded-chat d-flex flex-column flex-grow-1" data-roomid="{roomId}" style="min-width: 0px;">
-			<ul component="chat/message/content" class="chat-content p-0 m-0 list-unstyled overflow-auto flex-grow-1">
+			<ul component="chat/message/content" class="chat-content p-0 m-0 list-unstyled overflow-auto flex-grow-1 ghost-scrollbar">
 				<!-- IMPORT partials/chats/messages.tpl -->
 			</ul>
 			<ul component="chat/message/search/results" class="chat-content p-0 m-0 list-unstyled overflow-auto flex-grow-1 hidden">