From c8100712e86db4e93aee8e4ad6ed6a147c1794e0 Mon Sep 17 00:00:00 2001 From: nymkappa <1612910616@pm.me> Date: Wed, 23 Aug 2023 16:17:07 +0200 Subject: [PATCH] [footer] polish breakpoints in /services/* --- .../src/app/components/menu/menu.component.ts | 7 ++- .../global-footer.component.html | 10 ++-- .../global-footer.component.scss | 59 +++++++++++++++++++ .../global-footer/global-footer.component.ts | 12 ---- 4 files changed, 69 insertions(+), 19 deletions(-) diff --git a/frontend/src/app/components/menu/menu.component.ts b/frontend/src/app/components/menu/menu.component.ts index 0fa22aa7c..d12bbe47e 100644 --- a/frontend/src/app/components/menu/menu.component.ts +++ b/frontend/src/app/components/menu/menu.component.ts @@ -72,15 +72,18 @@ export class MenuComponent implements OnInit { @HostListener('window:click', ['$event']) onClick(event) { + const isServicesPageOnMobile = this.isServicesPage && this.isSmallScreen(); const cssClasses = event.target.className; + if (!cssClasses.indexOf) { // Click on chart or non html thingy, close the menu - this.navOpen = false; + if (!this.isServicesPage || isServicesPageOnMobile) { + this.navOpen = false; + } return; } const isHamburger = cssClasses.indexOf('profile_image') !== -1; const isMenu = cssClasses.indexOf('menu-click') !== -1; - const isServicesPageOnMobile = this.isServicesPage && this.isSmallScreen(); if (!isHamburger && !isMenu && (!this.isServicesPage || isServicesPageOnMobile)) { this.navOpen = false; return; diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html index af53a4b9c..73b4d0975 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.html +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html @@ -1,9 +1,9 @@ -