fix(ui): sidebar active state background (#1092)

frappe · Apr 5, 2023 · b15dbb2 · b15dbb2
1 parent d1e033c
commit b15dbb2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/desk/src/components/desk/SideBarMenu.vue b/desk/src/components/desk/SideBarMenu.vue
@@ -36,6 +36,7 @@
 				:class="{
 					'bg-gray-200': isActive(option.label),
 					'text-gray-900': isActive(option.label),
+					'hover:bg-gray-300': isActive(option.label),
 					'hover:bg-gray-100': !isActive(option.label),
 				}"
 				@click="$router.push(option.to)"
@@ -55,6 +56,7 @@
 				:class="{
 					'bg-gray-200': isActive(option.label),
 					'text-gray-900': isActive(option.label),
+					'hover:bg-gray-300': isActive(option.label),
 					'hover:bg-gray-100': !isActive(option.label),
 				}"
 				@click="$router.push(option.to)"
@@ -198,13 +200,13 @@ const profileSettings = [
 ];
 
 const routeMap = {
-	"Knowledge Base": "helpdesk/kb",
-	Contacts: "helpdesk/contacts",
-	Customers: "helpdesk/customers",
-	Dashboard: "helpdesk/dashboard",
-	Reports: "helpdesk/reports",
-	Settings: "helpdesk/settings",
-	Tickets: "helpdesk/tickets",
+	"Knowledge Base": "/kb",
+	Contacts: "/contacts",
+	Customers: "/customers",
+	Dashboard: "/dashboard",
+	Reports: "/reports",
+	Settings: "/settings",
+	Tickets: "/tickets",
 };
 
 function isActive(label: string) {

diff --git a/desk/src/pages/desk/Tickets.vue b/desk/src/pages/desk/Tickets.vue
@@ -50,7 +50,7 @@
 			</div>
 		</div>
 		<div class="bg-gray-100 px-6 font-sans text-base text-gray-500">
-			<div class="flex items-center p-2">
+			<div class="flex items-center px-2 py-1">
 				<div class="pl-1 pr-4">
 					<Input
 						type="checkbox"
@@ -73,7 +73,7 @@
 			<div
 				v-for="t in ticketList.list.data"
 				:key="t.name"
-				class="flex w-full items-center rounded-lg border-b px-2 py-1 shadow-black transition-all last-of-type:border-none hover:shadow-around"
+				class="hover:shadow-around flex w-full items-center rounded-lg border-b px-2 py-1 shadow-black transition-all last-of-type:border-none"
 			>
 				<div class="pl-1 pr-4">
 					<Input
@@ -149,7 +149,7 @@
 			class="fixed inset-x-0 bottom-5 mx-auto w-max font-sans text-base"
 		>
 			<div
-				class="flex items-center rounded-lg border border-gray-300 bg-white px-3 py-2 shadow-around"
+				class="shadow-around flex items-center rounded-lg border border-gray-300 bg-white px-3 py-2"
 			>
 				<div class="w-64">
 					<div class="inline-block align-middle">