From 0479a4d7a5fef97f2c51963bf2949a615cc3d47a Mon Sep 17 00:00:00 2001
From: Pierre HUBERT <pierre.git@communiquons.org>
Date: Mon, 5 Apr 2021 16:35:43 +0200
Subject: [PATCH] Update sidebar

---
 assets/css/components/sidebar.css    |  4 ++--
 assets/js/components/sidebar/main.js | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/assets/css/components/sidebar.css b/assets/css/components/sidebar.css
index b1e3108f..212f3003 100644
--- a/assets/css/components/sidebar.css
+++ b/assets/css/components/sidebar.css
@@ -132,8 +132,8 @@ add left border
 }
 */
 
-.main-sidebar .memberships-list .conversation_memberhsip.group-conversation {
-	padding-left: 20px;
+.main-sidebar .memberships-list .group-conversation {
+	margin-left: 25px;
 }
 
 .main-sidebar .memberships-list .conversation_memberhsip.has-unread-msg {
diff --git a/assets/js/components/sidebar/main.js b/assets/js/components/sidebar/main.js
index 8c048bc6..2ff5fcfa 100644
--- a/assets/js/components/sidebar/main.js
+++ b/assets/js/components/sidebar/main.js
@@ -88,12 +88,12 @@ const SidebarMain = {
 		});
 
 		this.refreshMemberships(userMemberships);
-		/* TODO  RESET let interval = setInterval(() => {
+		let interval = setInterval(() => {
 			if(userMemberships.isConnected)
 				this.refreshMemberships(userMemberships);
 			else
 				clearInterval(interval);
-		}, 15000);*/
+		}, 15000);
 
 
 		/*// Recent conversations
@@ -360,10 +360,12 @@ const SidebarMain = {
 			innerHTML: "<div style='height: 50px'></div>",
 		});
 
-		$(friendsTarget).slimscroll({
+		$.AdminLTE.layout.fixSidebar();
+
+		/*$(friendsTarget).slimscroll({
 			flex: 2,
 			height: "100%"
-		});
+		});*/
 
 		// Highlight active element
 		SidebarMain.refreshActiveElement()