fix #2922 @0.5

diff --git a/app/Http/Middleware/Menu.php b/app/Http/Middleware/Menu.php
index b86e902b185871d9673d4f5fdaae5377e6fd0cb6..11338ac757dec7246c79e06d8225647997fd6ec0 100644 (file)
--- a/app/Http/Middleware/Menu.php
+++ b/app/Http/Middleware/Menu.php
@@ -25,7 +25,7 @@ class Menu
             $parent = $menu->add($child->getTitle(), $child->getHref());
 
             // Handle items with submenus
-            if ($child->isMenuDesktopChildren() && $child->hasChildren()) {
+            if ($child->hasChildren()) {
                 // Create an empty sub-element that will serve as a wrapper for the submenu(s)
 
                 if ($child->getType() == 'mega') {

diff --git a/resources/js/components/Search.vue b/resources/js/components/Search.vue
index 98c47b8c9484fde52b0a30b143a1c10c7bf7eadf..cb1fd1d8f6089ff0b220fdc3464b2ede2f0e3f20 100644 (file)
--- a/resources/js/components/Search.vue
+++ b/resources/js/components/Search.vue
@@ -3,7 +3,7 @@
 
         <!-- Trigger Link that will appear inside the nav portal -->
         <portal to="nav-search-toggle">
-            <a href="#" class="text-white hover:text-blue" @click.prevent="toggleVisibility"
+            <a href="#" id="nav-search-toggle-link" class="text-white hover:text-blue" @click.prevent="toggleVisibility"
                :class="visible ? 'text-blue' : ''">
                 <slot name="link"></slot>
             </a>

diff --git a/resources/js/menu.js b/resources/js/menu.js
index c22d929eca6769a9f942c40be53067cf995dfa98..e6edc2b21c0db1fab887ee5ddcbd56fee34928b9 100644 (file)
--- a/resources/js/menu.js
+++ b/resources/js/menu.js
@@ -7,7 +7,7 @@ MmenuLight.prototype.offcanvas = offcanvas;
 document.addEventListener(
     'DOMContentLoaded', () => {
         let nav = document.getElementById("mobile-nav");
-        window.mmenu = new MmenuLight(nav, {title: "Menu", selected: 'active'});
+        window.mmenu = new MmenuLight(nav, {title: "Menu"});
         window.menu_breakpoint = 1023; // Note: this should match the menu CSS breakpoint in setup.styl!
 
         mmenu.enable(`(max-width: ${menu_breakpoint}px)`);
@@ -21,6 +21,11 @@ document.addEventListener(
                     event.stopPropagation();
 
                     if (null === document.querySelector('.mm--close')) {
+                        let search = document.querySelector('.mm li[data-name="recherche"] a');
+                        let searchIcon = document.getElementById('nav-search-toggle-link').innerHTML;
+                        console.log(searchIcon);
+                        search.innerHTML = searchIcon + search.innerHTML;
+
                         nav.innerHTML = '<a class="mm--close"></a>' + nav.innerHTML;
 
                         document.querySelector('.mm--close').addEventListener('click', (event) => {

diff --git a/resources/styles/components/mmenu.styl b/resources/styles/components/mmenu.styl
index 2d4eebb9a6b5b672f555cbbb95bec82ef04042d4..79446ab2bf7be6bea02b12cee89ca38cf98761dc 100644 (file)
--- a/resources/styles/components/mmenu.styl
+++ b/resources/styles/components/mmenu.styl
@@ -120,6 +120,11 @@
       --mm-item-height: var(--mm-item-item-height)
 
   li
+    svg
+      display inline
+      margin-right: 10px;
+      margin-top: -2px;
+
     &:after
       margin-left 0