From b6a747239a01eca192810a2ff782a0b952e2a05a Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 14 Sep 2023 10:30:10 +0200
Subject: [PATCH] [FIX] portal, website_blog: align the navigation

Prior to this commit, the navigation of `website_blog` wasn't correctly
aligned. This commit reworks the alignment to match the page layout.

This was actually a "bug" of our override of BS4/5 to match BS3 behavior
regarding container float-clearing. This fixes that override. It may
be backported in stable versions later if the need arises.

Related to task-3097005

closes odoo/odoo#137692

Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Co-authored-by: Brieuc-brd <brd@odoo.com>
---
 addons/portal/static/src/scss/portal.scss             | 7 +++++++
 addons/website_blog/static/src/scss/website_blog.scss | 2 +-
 addons/website_blog/views/website_blog_components.xml | 2 +-
 addons/website_blog/views/website_blog_templates.xml  | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/portal/static/src/scss/portal.scss b/addons/portal/static/src/scss/portal.scss
index a88a54dd44b..2f3d22fbf6a 100644
--- a/addons/portal/static/src/scss/portal.scss
+++ b/addons/portal/static/src/scss/portal.scss
@@ -110,6 +110,13 @@ li > p {
             clear: both;
         }
     }
+    .navbar %container-flex-properties {
+        // Bootstrap set-up flex alignment to "space-between" here. The hack
+        // made above to restore the BS3 protection has to be disabled.
+        &::before, &::after {
+            display: none;
+        }
+    }
 }
 [class^="col-lg-"] {
     min-height: 24px;
diff --git a/addons/website_blog/static/src/scss/website_blog.scss b/addons/website_blog/static/src/scss/website_blog.scss
index 2e29bb6b167..21b04fb30b2 100644
--- a/addons/website_blog/static/src/scss/website_blog.scss
+++ b/addons/website_blog/static/src/scss/website_blog.scss
@@ -238,7 +238,7 @@ $o-wblog-loader-size: 50px;
 
             padding-top: 33%;
             height: auto!important;
-            // This is mandatory as we do not want the CoverProperties 
+            // This is mandatory as we do not want the CoverProperties
             // sizing classes to be applied here
             min-height: auto!important;
 
diff --git a/addons/website_blog/views/website_blog_components.xml b/addons/website_blog/views/website_blog_components.xml
index 02d6dae0cbf..f86525cb7ee 100644
--- a/addons/website_blog/views/website_blog_components.xml
+++ b/addons/website_blog/views/website_blog_components.xml
@@ -5,7 +5,7 @@
 <!-- ======   Template: Blogs Navbar   =========================================
 ============================================================================ -->
 <template id="blogs_nav" name="Blogs Bar Template">
-    <nav t-attf-class="navbar navbar-expand-sm navbar-light #{additionnal_classes}">
+    <nav t-attf-class="navbar navbar-expand-sm navbar-light #{additional_classes}">
         <div class="container">
             <ul class="navbar-nav" t-if="len(blogs) > 1">
                 <li class="nav-item">
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 4451544cb55..0d5ec251060 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -64,6 +64,7 @@ list of filtered posts (by date or tag).
 
         <t t-call="website_blog.blogs_nav">
             <t t-set="search" t-value="original_search or search"/>
+            <t t-set="additional_classes" t-value="'mt-3'"/>
         </t>
 
         <section id="o_wblog_index_content" t-att-class="opt_blog_cards_design and 'o_wblog_page_cards_bg'">