diff --git a/src/app/library/sharedComponents/sidebar/sideBar.component.html b/src/app/library/sharedComponents/sidebar/sideBar.component.html
index 65d9631..c25c0b2 100644
--- a/src/app/library/sharedComponents/sidebar/sideBar.component.html
+++ b/src/app/library/sharedComponents/sidebar/sideBar.component.html
@@ -24,8 +24,8 @@
- -
-
+
-
+
diff --git a/src/app/library/sharedComponents/sidebar/sideBar.component.ts b/src/app/library/sharedComponents/sidebar/sideBar.component.ts
index 202f03c..10e7b8b 100644
--- a/src/app/library/sharedComponents/sidebar/sideBar.component.ts
+++ b/src/app/library/sharedComponents/sidebar/sideBar.component.ts
@@ -1,5 +1,4 @@
import {Component, Input, OnInit} from '@angular/core';
-import {Router} from "@angular/router";
import {Header, Item} from "../../../utils/entities/sidebar";
@Component({
@@ -13,15 +12,14 @@ export class SideBarComponent implements OnInit {
@Input() activeItem: string = '';
@Input() activeSubItem: string = '';
- constructor(private router: Router) {
- }
+ constructor() {}
ngOnInit(): void {
}
- isTheActiveMenuItem(item: Item, subItem = false): boolean {
+ isTheActiveMenuItem(item: Item, subItem: Item = null): boolean {
return (!subItem && this.activeItem === item.id) ||
- (subItem && this.activeSubItem === item.id);
+ (subItem && this.activeItem === item.id && this.activeSubItem === subItem.id);
}
}
diff --git a/src/assets/theme-assets/dashboard-custom.css b/src/assets/theme-assets/dashboard-custom.css
index bd17ad3..c27be13 100644
--- a/src/assets/theme-assets/dashboard-custom.css
+++ b/src/assets/theme-assets/dashboard-custom.css
@@ -44,6 +44,7 @@ html .dashboard {
.dashboard #sidebar_main .menu_section > ul li > a {
font-size: var(--sidebar-font-size);
+ line-height: 19px;
color: rgba(0, 0, 0, 0.7);
}