From b6c0f6be3ee0385e0057cefcdc2fe059de1ac15a Mon Sep 17 00:00:00 2001
From: rodriciru <rodriciru@gmail.com>
Date: Tue, 5 Sep 2023 13:16:46 +0000
Subject: [PATCH 1/2] Add classes to make menu elements tall as parent

---
 modules/ps_mainmenu/ps_mainmenu.tpl   | 8 ++++----
 modules/ps_searchbar/ps_searchbar.tpl | 2 +-
 templates/_partials/header.tpl        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/ps_mainmenu/ps_mainmenu.tpl b/modules/ps_mainmenu/ps_mainmenu.tpl
index 6f582bb8a..3a293c6ca 100644
--- a/modules/ps_mainmenu/ps_mainmenu.tpl
+++ b/modules/ps_mainmenu/ps_mainmenu.tpl
@@ -2,12 +2,12 @@
   {if $nodes|count}
     <ul
       {if $depth === 0}id="top-menu"{/if}
-      class="{if $depth === 0}main-menu__tree{else if $depth === 1}row row-cols-4 gy-3{else}submenu{/if}"
+      class="{if $depth === 0}main-menu__tree h-100{else if $depth === 1}row row-cols-4 gy-3{else}submenu{/if}"
       data-depth="{$depth}"
     >
     {foreach from=$nodes item=node}
       <li
-        class="{$node.type}{if $node.current} current{/if}{if $depth === 0} main-menu__tree__item{/if}"
+        class="{$node.type}{if $node.current} current{/if}{if $depth === 0} main-menu__tree__item d-flex align-items-center h-100{/if}"
         id="{$node.page_identifier}"
       >
         {if $depth > 1 && $node.children|count}
@@ -104,8 +104,8 @@
   {/if}
 {/function}
 
-<div class="main-menu col-xl col-auto">
-  <div class="d-none d-xl-block position-static js-menu-desktop">
+<div class="main-menu col-xl col-auto d-flex align-items-center">
+  <div class="d-none d-xl-block position-static js-menu-desktop h-100">
     {desktopMenu nodes=$menu.children}
   </div>
 
diff --git a/modules/ps_searchbar/ps_searchbar.tpl b/modules/ps_searchbar/ps_searchbar.tpl
index 3f5a7174e..0111506c7 100644
--- a/modules/ps_searchbar/ps_searchbar.tpl
+++ b/modules/ps_searchbar/ps_searchbar.tpl
@@ -23,7 +23,7 @@
  * International Registered Trademark & Property of PrestaShop SA
  *}
 
-<div id="_desktop_search" class="order-2 ms-auto col-auto d-none d-md-flex">
+<div id="_desktop_search" class="order-2 ms-auto col-auto d-none d-md-flex align-items-center">
   <div id="search_widget" class="search-widgets js-search-widget" data-search-controller-url="{$search_controller_url}">
     <form method="get" action="{$search_controller_url}">
       <input type="hidden" name="controller" value="search">
diff --git a/templates/_partials/header.tpl b/templates/_partials/header.tpl
index d4cff9392..737ca0020 100644
--- a/templates/_partials/header.tpl
+++ b/templates/_partials/header.tpl
@@ -29,7 +29,7 @@
 {block name='header_bottom'}
   <div class="{$headerBottomName}">
     <div class="container-md {$headerBottomName}__container">
-      <div class="row align-items-center gx-2 {$headerBottomName}__row">
+      <div class="row gx-2 {$headerBottomName}__row">
         <div class="col-auto logo order-xl-1 ms-lg-0 ms-2 me-lg-0 me-auto">
           {if $shop.logo_details}
             {if $page.page_name == 'index'}<h1 class="{$headerBottomName}__h1 mb-0">{/if}

From 614edd4a75f9d22d48fc5108338f67daacabe82b Mon Sep 17 00:00:00 2001
From: rodriciru <rodriciru@gmail.com>
Date: Thu, 7 Sep 2023 09:54:23 +0200
Subject: [PATCH 2/2] Apply suggestions from tblivet

Co-authored-by: Blivet Thibault <110676325+tblivet@users.noreply.github.com>
---
 templates/_partials/header.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/_partials/header.tpl b/templates/_partials/header.tpl
index 737ca0020..c7416c120 100644
--- a/templates/_partials/header.tpl
+++ b/templates/_partials/header.tpl
@@ -29,8 +29,8 @@
 {block name='header_bottom'}
   <div class="{$headerBottomName}">
     <div class="container-md {$headerBottomName}__container">
-      <div class="row gx-2 {$headerBottomName}__row">
-        <div class="col-auto logo order-xl-1 ms-lg-0 ms-2 me-lg-0 me-auto">
+      <div class="row gx-2 align-items-stretch {$headerBottomName}__row">
+        <div class="d-flex align-items-center col-auto logo order-xl-1 ms-lg-0 ms-2 me-lg-0 me-auto">
           {if $shop.logo_details}
             {if $page.page_name == 'index'}<h1 class="{$headerBottomName}__h1 mb-0">{/if}
               {renderLogo}