From a517f78bfe0c5d2ce2e2b731a9fb627368319f46 Mon Sep 17 00:00:00 2001 From: alexisben <alexiben7@gmail.com> Date: Mon, 1 Aug 2022 14:59:57 +0200 Subject: [PATCH] fix menu js --- assets/js/theme/nav/mainMenu.js | 8 ++++++-- assets/sass/_theme/_configuration.sass | 9 ++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/assets/js/theme/nav/mainMenu.js b/assets/js/theme/nav/mainMenu.js index 34b592aa..3847abf2 100644 --- a/assets/js/theme/nav/mainMenu.js +++ b/assets/js/theme/nav/mainMenu.js @@ -68,7 +68,11 @@ class MainMenu { classAction = this.state.isOpened ? 'add' : 'remove'; this.mainButton.setAttribute('aria-expanded', this.state.isOpened); this.menu.classList[classAction](CLASSES.mainMenuOpened); - document.documentElement.classList[classAction](CLASSES.menusOpened); + + // Close dropdown to avoid keeping overlay when mobile and menu closed + if (this.state.isMobile && !this.state.isOpened) { + this.state.hasDropdownOpened = false; + } // Update global overlay this.updateOverlay(); @@ -123,7 +127,7 @@ class MainMenu { y = window.scrollY, isNearTop = y < offset; - if (isNearTop) { + if (isNearTop) { this.element.classList.remove(CLASSES.sticky); } else { this.element.classList.add(CLASSES.sticky); diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass index 75a4c473..0354eabd 100644 --- a/assets/sass/_theme/_configuration.sass +++ b/assets/sass/_theme/_configuration.sass @@ -26,7 +26,14 @@ $line-height-base: 1.4 !default $body-font-size: 16px !default $small-font-size: 14px !default -$h1-size: px2rem(60) !default +$h1-size-md: px2rem(60) !default +$h2-size-md: px2rem(40) !default +$h3-size-md: px2rem(30) !default +$h4-size-md: px2rem(20) !default +$h5-size-md: px2rem(18) !default +$h6-size-md: px2rem(16) !default + +$h1-size: px2rem(30) !default $h2-size: px2rem(40) !default $h3-size: px2rem(30) !default $h4-size: px2rem(20) !default -- GitLab