Merge pull request #343 from Oksydan/preparation-for-new-menu-module

Changes to theme in preparation for new menu module
Oksydan · Nov 27, 2023 · 3ac291f · 3ac291f
2 parents f0f02ea + cb300d5
commit 3ac291f
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 207 deletions.
diff --git a/_dev/css/theme/components/_index.scss b/_dev/css/theme/components/_index.scss
@@ -2,7 +2,6 @@
 @import "customer/index";
 @import "cart/index";
 @import "cms/index";
-@import "menu/index";
 @import "404/index";
 @import "newsletter/index";
 @import "homeslider/index";

diff --git a/_dev/css/theme/components/menu/_index.scss b/_dev/css/theme/components/menu/_index.scss
diff --git a/_dev/css/theme/components/menu/_mainmenu.scss b/_dev/css/theme/components/menu/_mainmenu.scss
diff --git a/_dev/js/theme/components/header/index.js b/_dev/js/theme/components/header/index.js
@@ -1,5 +1,4 @@
 import { DOMReady } from '../../../utils/DOM/DOMHelpers';
-import useTopMenu from './useTopMenu';
 import useStickyElement from '../useStickyElement';
 
 const initStickyHeader = () => {
@@ -14,8 +13,5 @@ const initStickyHeader = () => {
 };
 
 DOMReady(() => {
-  const { init: initTopMenu } = useTopMenu('.js-main-menu');
-
-  initTopMenu();
   initStickyHeader();
 });
diff --git a/_dev/js/theme/components/header/useTopMenu.js b/_dev/js/theme/components/header/useTopMenu.js
diff --git a/config/theme.yml b/config/theme.yml
@@ -57,12 +57,14 @@ global_settings:
      - is_shoppingcart
      - is_imageslider
      - is_searchbar
+     - is_mainmenu
    to_disable:
      - blockreassurance
      - ps_searchbar
      - ps_shoppingcart
      - ps_imageslider
      - blockwishlist
+     - ps_mainmenu
   hooks:
     modules_to_hook:
       displayNav1:

diff --git a/templates/_partials/header.tpl b/templates/_partials/header.tpl
@@ -56,7 +56,7 @@
                                     href="#"
                                     role="button"
                                     data-bs-toggle="offcanvas"
-                                    data-bs-target="#mobile_top_menu_wrapper"
+                                    data-bs-target="#mobile_menu_offcanvas"
                             >
                                 <div class="header-top__icon-container">
                                     <span class="header-top__icon material-icons">menu</span>

diff --git a/templates/_partials/mobile-modals.tpl b/templates/_partials/mobile-modals.tpl
@@ -1,6 +1,4 @@
 
 {include file="_partials/modal-search.tpl"}
 
-{include file="_partials/modal-menu.tpl"}
-
 {include file="_partials/modal-filters.tpl"}
diff --git a/templates/_partials/modal-menu.tpl b/templates/_partials/modal-menu.tpl
diff --git a/templates/layouts/layout-both-columns.tpl b/templates/layouts/layout-both-columns.tpl
@@ -120,6 +120,8 @@
       {include file="_partials/page-loader.tpl"}
     {/block}
 
+    {hook h='displayMobileMenu'}
+
   </body>
 
 </html>