From 1576ad0a9c58d89e270b9929e17849359ca877ac Mon Sep 17 00:00:00 2001
From: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com>
Date: Mon, 4 Apr 2022 10:09:38 -0400
Subject: [PATCH] Using font size and spacing for mega menu hierarchy (#1520)

* Using font size and spacing for mega menu hierarchy

Co-authored-by: LucasLacerdaUX <lucas.lacerda@shopify.com>
Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com>
---
 assets/component-mega-menu.css   | 30 ++++++++++++++++++------------
 assets/component-menu-drawer.css |  1 +
 assets/details-disclosure.js     |  7 +++++--
 sections/header.liquid           |  4 ++--
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/assets/component-mega-menu.css b/assets/component-mega-menu.css
index d5a6a479dd8..d233a3afb5b 100644
--- a/assets/component-mega-menu.css
+++ b/assets/component-mega-menu.css
@@ -8,7 +8,6 @@
   border-radius: 0;
   border-right: 0;  
   left: 0;
-  max-height: calc(100vh - var(--header-bottom-position-desktop, 20rem) - 4rem);
   overflow-y: auto;
   padding-bottom: 2.4rem;
   padding-top: 2.4rem;
@@ -18,6 +17,10 @@
   z-index: -1;
 }
 
+.shopify-section-header-sticky .mega-menu__content {
+  max-height: calc(100vh - var(--header-bottom-position-desktop, 20rem) - 4rem);
+}
+
 .header-wrapper--border-bottom .mega-menu__content {
   border-top: 0;
 }
@@ -28,15 +31,8 @@
 }
 
 .mega-menu[open] .mega-menu__content {
-  animation: animateMenuOpen var(--duration-default) ease;
-  animation-fill-mode: forwards;
-}
-
-@media (prefers-reduced-motion) {
-  .mega-menu[open] .mega-menu__content {
-    opacity: 1;
-    transform: translateY(0);
-  }
+  opacity: 1;
+  transform: translateY(0);
 }
 
 .mega-menu__list {
@@ -49,11 +45,21 @@
 .mega-menu__link {
   color: rgba(var(--color-foreground), 0.75);
   display: block;
+  font-size: 1.3rem;
   line-height: calc(1 + 0.3 / var(--font-body-scale));
-  padding-bottom: 0.8rem;
-  padding-top: 0.8rem;
+  padding-bottom: 0.6rem;
+  padding-top: 0.6rem;
   text-decoration: none;
   transition: text-decoration var(--duration-short) ease;
+  word-wrap: break-word;
+}
+
+.mega-menu__link--level-2 {
+  font-size: 1.4rem;
+}
+
+.mega-menu__link--level-2:not(:only-child) {
+  margin-bottom: 0.8rem;
 }
 
 .header--top-center .mega-menu__list {
diff --git a/assets/component-menu-drawer.css b/assets/component-menu-drawer.css
index a76fedf8451..85cfbe13e53 100644
--- a/assets/component-menu-drawer.css
+++ b/assets/component-menu-drawer.css
@@ -202,6 +202,7 @@ details[open].menu-opening > .menu-drawer__submenu {
   background-color: transparent;
   font-family: var(--font-body-family);
   font-style: var(--font-body-style);
+  text-align: left;
 }
 
 .no-js .menu-drawer__close-button {
diff --git a/assets/details-disclosure.js b/assets/details-disclosure.js
index 6fc6707c8c0..cc12836bcd0 100644
--- a/assets/details-disclosure.js
+++ b/assets/details-disclosure.js
@@ -35,12 +35,15 @@ customElements.define('details-disclosure', DetailsDisclosure);
 class HeaderMenu extends DetailsDisclosure {
   constructor() {
     super();
-    this.header = document.querySelector('header');
+    this.header = document.querySelector('.header-wrapper');
   }
 
   onToggle() {
+    if (!this.header) return;
+    this.header.preventHide = this.mainDetailsToggle.open;
+
     if (document.documentElement.style.getPropertyValue('--header-bottom-position-desktop') !== '') return;
-    if (this.header) document.documentElement.style.setProperty('--header-bottom-position-desktop', `${Math.floor(this.header.getBoundingClientRect().bottom)}px`);
+    document.documentElement.style.setProperty('--header-bottom-position-desktop', `${Math.floor(this.header.getBoundingClientRect().bottom)}px`);
   }
 }
 
diff --git a/sections/header.liquid b/sections/header.liquid
index 90ebc186012..40a6e65deb6 100644
--- a/sections/header.liquid
+++ b/sections/header.liquid
@@ -431,7 +431,7 @@
                         <ul class="mega-menu__list page-width{% if link.levels == 1 %} mega-menu__list--condensed{% endif %}" role="list">
                           {%- for childlink in link.links -%}
                             <li>
-                              <a href="{{ childlink.url }}" class="mega-menu__link link font-body-bold{% if childlink.current %} mega-menu__link--active{% endif %}"{% if childlink.current %} aria-current="page"{% endif %}>
+                              <a href="{{ childlink.url }}" class="mega-menu__link mega-menu__link--level-2 link{% if childlink.current %} mega-menu__link--active{% endif %}"{% if childlink.current %} aria-current="page"{% endif %}>
                                 {{ childlink.title | escape }}
                               </a>
                               {%- if childlink.links != blank -%}
@@ -618,6 +618,7 @@
       if (this.predictiveSearch && this.predictiveSearch.isOpen) return;
 
       if (scrollTop > this.currentScrollTop && scrollTop > this.headerBounds.bottom) {
+        if (this.preventHide) return;
         requestAnimationFrame(this.hide.bind(this));
       } else if (scrollTop < this.currentScrollTop && scrollTop > this.headerBounds.bottom) {
         if (!this.preventReveal) {
@@ -635,7 +636,6 @@
         requestAnimationFrame(this.reset.bind(this));
       }
 
-
       this.currentScrollTop = scrollTop;
     }