for hamburger meny working with existing toggle property

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.scss
index 32c0b2ae8c0e2b25ed5546d5886d8b9a309d6568..fb67f47e2937b2479ddd8e71f32ad39da7b8af0b 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.scss
@@ -7,6 +7,7 @@
 }
 
 .container-fluid {
+  top: 30px;
   overflow: auto;
   position: absolute;
 }

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
index dd1b6edfa00d3c21eb35de897519d71e099ba798..7f81cb0d7828e67fbadf7bb62f6f5d4319afdeaf 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
@@ -3,7 +3,7 @@
 <!-- ************************ -->
 <ng-template #header>
 <cds-header name="Ceph Dashboard">
-  <cds-hamburger (click)="showMenuSidebar = !showMenuSidebar"></cds-hamburger>
+  <cds-hamburger [active]="showMenuSidebar" (selected)="showMenuSidebar = !showMenuSidebar"></cds-hamburger>
   <cds-header-navigation>
     <cd-language-selector></cd-language-selector>
   </cds-header-navigation>
@@ -132,7 +132,7 @@
 <ng-template #cd_menu>
   <ng-container *ngIf="enabledFeature$ | async as enabledFeature">
   <div cdsTheme="theme">
-    <cds-sidenav class="mt-5">
+    <cds-sidenav [expanded]="showMenuSidebar" class="mt-5">
       <!-- Dashboard -->
       <cds-sidenav-item routerLinkActive="active" routerLink="/dashboard" [useRouter]="true">
         <svg cdsIcon="template" icon size="16"></svg>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.scss
index 8724b0b3a42dc03c16c824f8da5d5a83faffd54f..f52e52f6dfcf8441b83d5b381aa2ba7aff8dea55 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.scss
@@ -188,7 +188,8 @@ $sidebar-width: 192px;
     width: $sidebar-width;
 
     &.active {
-      margin-left: -$sidebar-width;
+      // margin-left: -$sidebar-width;
+      margin-left: -155px;
     }
 
     // ul {

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts
index 6f52dc6cf339142024bae644bb608ab6b19a16bd..d0b5fcf81069cf0f7eacaf61a1f8faede4037a33 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts
@@ -6,7 +6,6 @@ import { Subscription } from 'rxjs';
 import { MultiClusterService } from '~/app/shared/api/multi-cluster.service';
 import { SettingsService } from '~/app/shared/api/settings.service';
 
-import { Icons } from '~/app/shared/enum/icons.enum';
 import { MultiCluster } from '~/app/shared/models/multi-cluster';
 import { Permissions } from '~/app/shared/models/permissions';
 import { AuthStorageService } from '~/app/shared/services/auth-storage.service';
@@ -36,7 +35,6 @@ export class NavigationComponent implements OnInit, OnDestroy {
   enabledFeature$: FeatureTogglesMap$;
   clusterTokenStatus: object = {};
   summaryData: any;
-  icons = Icons;
 
   rightSidebarOpen = false; // rightSidebar only opens when width is less than 768px
   showMenuSidebar = true;

diff --git a/src/pybind/mgr/dashboard/frontend/src/styles.scss b/src/pybind/mgr/dashboard/frontend/src/styles.scss
index cd870644cf7b66650a825e418f218f7d597d6d22..e112e299fa522b961b34d8c3df5f5e6b92412707 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/styles.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/styles.scss
@@ -1,4 +1,5 @@
 /* You can add global styles to this file, and also import other style files */
+@use './src/styles/defaults' as *;
 /*** CARBON START ****/
 
 @use "@carbon/styles/scss/config" with (
@@ -14,7 +15,6 @@
 // }
 
 /*** CARBON START ****/
-@use './src/styles/defaults' as *;
 
 // Angular2-Tree Component
 @import '@circlon/angular-tree-component/css/angular-tree-component.css';