From c590b35f0e3e44279b4258b50ceea62d9c89acac Mon Sep 17 00:00:00 2001 From: Dikshit Moradiya Date: Fri, 28 Jun 2024 13:39:29 +0530 Subject: [PATCH 1/2] fix table media bug --- package.json | 2 +- src/app/theme/layout/admin/admin.component.html | 1 + src/app/theme/layout/admin/admin.component.ts | 12 ++++++++++++ .../nav-content/nav-content.component.ts | 14 ++------------ src/scss/menu/_menu-lite.scss | 3 +-- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index bb8a17fe..02a0d57e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "datta-able-free-angular-admin-template", - "version": "5.1.0", + "version": "5.1.1", "author": "CodedThemes", "scripts": { "ng": "ng", diff --git a/src/app/theme/layout/admin/admin.component.html b/src/app/theme/layout/admin/admin.component.html index 354b0c0f..2dfc40ce 100644 --- a/src/app/theme/layout/admin/admin.component.html +++ b/src/app/theme/layout/admin/admin.component.html @@ -21,5 +21,6 @@ +
diff --git a/src/app/theme/layout/admin/admin.component.ts b/src/app/theme/layout/admin/admin.component.ts index 7ea473c8..6c2b2024 100644 --- a/src/app/theme/layout/admin/admin.component.ts +++ b/src/app/theme/layout/admin/admin.component.ts @@ -36,4 +36,16 @@ export class AdminComponent { this.navCollapsedMob = !this.navCollapsedMob; } } + + handleKeyDown(event: KeyboardEvent): void { + if (event.key === 'Escape') { + this.closeMenu(); + } + } + + closeMenu() { + if (document.querySelector('app-navigation.pcoded-navbar').classList.contains('mob-open')) { + document.querySelector('app-navigation.pcoded-navbar')?.classList.remove('mob-open'); + } + } } diff --git a/src/app/theme/layout/admin/navigation/nav-content/nav-content.component.ts b/src/app/theme/layout/admin/navigation/nav-content/nav-content.component.ts index 92431a61..238c9741 100644 --- a/src/app/theme/layout/admin/navigation/nav-content/nav-content.component.ts +++ b/src/app/theme/layout/admin/navigation/nav-content/nav-content.component.ts @@ -1,5 +1,5 @@ // angular import -import { Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Output } from '@angular/core'; import { Location } from '@angular/common'; // project import @@ -11,7 +11,7 @@ import { environment } from 'src/environments/environment'; templateUrl: './nav-content.component.html', styleUrls: ['./nav-content.component.scss'] }) -export class NavContentComponent implements OnInit { +export class NavContentComponent { // public props title = 'Demo application for version numbering'; currentApplicationVersion = environment.appVersion; @@ -28,16 +28,6 @@ export class NavContentComponent implements OnInit { this.navigation = this.nav.get(); } - // life cycle event - ngOnInit() { - if (this.windowWidth < 992) { - setTimeout(() => { - document.querySelector('.pcoded-navbar').classList.add('menupos-static'); - (document.querySelector('#nav-ps-datta') as HTMLElement).style.maxHeight = '100%'; - }, 500); - } - } - // public method navMob() { if (this.windowWidth < 992 && document.querySelector('app-navigation.pcoded-navbar').classList.contains('mob-open')) { diff --git a/src/scss/menu/_menu-lite.scss b/src/scss/menu/_menu-lite.scss index bdefd754..bc68e03a 100644 --- a/src/scss/menu/_menu-lite.scss +++ b/src/scss/menu/_menu-lite.scss @@ -1125,7 +1125,7 @@ ~ .pcoded-main-container { margin-left: $Menu-collapsed-width; - &:before { + .pc-menu-overlay { position: absolute; top: 0; left: 0; @@ -1213,7 +1213,6 @@ .pcoded-navbar { margin-left: -#{$Menu-width}; - position: absolute; height: 100%; box-shadow: none; From 0f2818b9fa51f79d38eb3591aa00e28771c070c0 Mon Sep 17 00:00:00 2001 From: Dikshit Moradiya Date: Sat, 29 Jun 2024 12:13:17 +0530 Subject: [PATCH 2/2] version change --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 02a0d57e..bb8a17fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "datta-able-free-angular-admin-template", - "version": "5.1.1", + "version": "5.1.0", "author": "CodedThemes", "scripts": { "ng": "ng",