From b4f043d32dd4fefc104d0fca429f4b39a23e1166 Mon Sep 17 00:00:00 2001
From: Faton Ramadani <faton.ramadani14@gmail.com>
Date: Thu, 2 Nov 2023 17:01:40 +0100
Subject: [PATCH] feat(frontend): fix sidebar (#2544)

* feat(frontend): fix sidebar

* feat(frontend): fix sidebar
---
 .../src/lib/components/icons/WindmillIcon.svelte     | 12 +++++++++---
 .../src/lib/components/sidebar/SidebarContent.svelte |  6 ++++--
 frontend/src/routes/(root)/(logged)/+layout.svelte   |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/frontend/src/lib/components/icons/WindmillIcon.svelte b/frontend/src/lib/components/icons/WindmillIcon.svelte
index 0b095cec09..ea49d7cd6e 100644
--- a/frontend/src/lib/components/icons/WindmillIcon.svelte
+++ b/frontend/src/lib/components/icons/WindmillIcon.svelte
@@ -35,6 +35,9 @@
 		.st2 {
 			fill: #bcd4fc;
 		}
+		.st2-gray {
+			fill: #cccccc;
+		}
 		.st3 {
 			fill: #3b82f6;
 		}
@@ -77,7 +80,8 @@
 	</style>
 	<g>
 		<polygon
-			class="st2"
+			class:st2={!white}
+			class:st2-gray={white}
 			points="134.78,14.22 114.31,48.21 101.33,69.75 158.22,69.75 177.97,36.95 191.67,14.22 	"
 		/>
 		<polygon
@@ -97,11 +101,13 @@
 			points="121.7,131.95 101.23,96.49 58.59,22.63 30.15,71.91 44.34,96.49 79.57,157.5 93.26,181.22 	"
 		/>
 		<polygon
-			class="st2"
+			class:st2={!white}
+			class:st2-gray={white}
 			points="64.81,131.95 25.15,131.21 0,130.74 28.44,180.01 66.73,180.72 93.26,181.21 	"
 		/>
 		<polygon
-			class="st2"
+			class:st2={!white}
+			class:st2-gray={white}
 			points="165.38,181.74 184.58,216.46 196.75,238.47 225.19,189.2 206.66,155.69 193.83,132.46 	"
 		/>
 	</g>
diff --git a/frontend/src/lib/components/sidebar/SidebarContent.svelte b/frontend/src/lib/components/sidebar/SidebarContent.svelte
index b7485fe0b4..ae76da9123 100644
--- a/frontend/src/lib/components/sidebar/SidebarContent.svelte
+++ b/frontend/src/lib/components/sidebar/SidebarContent.svelte
@@ -89,13 +89,15 @@
 	export let isCollapsed: boolean = false
 </script>
 
-<nav class="grow flex flex-col overflow-x-hidden scrollbar-hidden px-2 md:pb-4 gap-16">
+<nav
+	class="grow flex flex-col overflow-x-hidden scrollbar-hidden px-2 md:pb-2 gap-16 justify-between"
+>
 	<div class="space-y-1 pt-4 mb-6 md:mb-10">
 		{#each mainMenuLinks as menuLink (menuLink.href)}
 			<MenuLink class="!text-xs" {...menuLink} {isCollapsed} />
 		{/each}
 	</div>
-	<div class="flex flex-col h-full justify-between">
+	<div class="flex flex-col h-full justify-end">
 		<div class="space-y-0.5 mb-6 md:mb-10">
 			{#each secondaryMenuLinks as menuLink (menuLink.href)}
 				{#if menuLink.subItems}
diff --git a/frontend/src/routes/(root)/(logged)/+layout.svelte b/frontend/src/routes/(root)/(logged)/+layout.svelte
index c0967f12f6..42f60e1609 100644
--- a/frontend/src/routes/(root)/(logged)/+layout.svelte
+++ b/frontend/src/routes/(root)/(logged)/+layout.svelte
@@ -267,7 +267,7 @@
 
 				<SidebarContent {isCollapsed} />
 
-				<div class="flex-shrink-0 flex px-4 pb-3.5 pt-3 border-t border-gray-700">
+				<div class="flex-shrink-0 flex px-4 pb-3.5">
 					<button
 						on:click={() => {
 							isCollapsed = !isCollapsed