From d8e52e96b5819a1ecd3463e1c063264e15927f3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Souk=C3=A9ina=20Bojabza?= <sobo@odoo.com>
Date: Tue, 24 Sep 2024 14:56:09 +0200
Subject: [PATCH] [FIX] theme_*: adapt `s_carousel_intro` without `display:
 flex`

*: bewise, loftspace, monglia, notes, vehicle

In the community PR, the `s_carousel_intro` snippet has been modified in
order to not be in `display: flex` anymore.

This commit adapts this snippet customizations to these changes. More
precisely, it adapts the vertical padding and the grid areas to the text
content, in order to avoid having an overflow.

It also fixes the "Monglia" customization by removing the background
color of the slides, in order to make the added shape visible.

Related to task-4077628

closes odoo/design-themes#915

Related: odoo/odoo#180515
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
---
 theme_bewise/views/customizations.xml               | 3 +++
 theme_loftspace/views/snippets/s_carousel_intro.xml | 4 ++++
 theme_monglia/views/customizations.xml              | 9 +++++++++
 theme_notes/views/snippets/s_carousel_intro.xml     | 4 ++++
 theme_vehicle/views/customizations.xml              | 4 ++++
 5 files changed, 24 insertions(+)

diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml
index c70495bdc..f922b1664 100644
--- a/theme_bewise/views/customizations.xml
+++ b/theme_bewise/views/customizations.xml
@@ -484,6 +484,9 @@
 
 <!-- ======== CAROUSEL INTRO ======== -->
 <template id="s_carousel_intro" inherit_id="website.s_carousel_intro" name="Be Wise s_carousel_intro">
+    <xpath expr="//div[hasclass('carousel-item')][2]//div[hasclass('o_grid_item')][2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 0px;" remove="--grid-item-padding-y: 20px;" separator=";"/>
+    </xpath>
     <xpath expr="//h1" position="replace" mode="inner">
         Empowering your academic future
     </xpath>
diff --git a/theme_loftspace/views/snippets/s_carousel_intro.xml b/theme_loftspace/views/snippets/s_carousel_intro.xml
index a4b873c1a..01803f0a4 100644
--- a/theme_loftspace/views/snippets/s_carousel_intro.xml
+++ b/theme_loftspace/views/snippets/s_carousel_intro.xml
@@ -15,6 +15,10 @@
     <xpath expr="(//div[hasclass('carousel-item')])[3]" position="attributes">
         <attribute name="class" add="o_cc5" remove="o_cc1" separator=" "/>
     </xpath>
+    <xpath expr="//div[hasclass('carousel-item')][2]//div[hasclass('o_grid_item')][2]" position="attributes">
+        <attribute name="class" add="g-height-3" remove="g-height-2" separator=" "/>
+        <attribute name="style" add="grid-area: 6 / 7 / 9 / 11;" remove="grid-area: 7 / 7 / 9 / 11;" separator=";"/>
+    </xpath>
 
     <!-- Texts -->
     <xpath expr="//h1" position="replace" mode="inner">
diff --git a/theme_monglia/views/customizations.xml b/theme_monglia/views/customizations.xml
index 28728fc49..c8dd0800c 100644
--- a/theme_monglia/views/customizations.xml
+++ b/theme_monglia/views/customizations.xml
@@ -219,6 +219,15 @@
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
         <div class="o_we_shape o_web_editor_Wavy_08"/>
     </xpath>
+    <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
+        <attribute name="class" remove="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('carousel-item')])[2]" position="attributes">
+        <attribute name="class" remove="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('carousel-item')])[3]" position="attributes">
+        <attribute name="class" remove="o_cc o_cc1" separator=" "/>
+    </xpath>
 
     <!-- Texts -->
     <xpath expr="//h1" position="replace" mode="inner">
diff --git a/theme_notes/views/snippets/s_carousel_intro.xml b/theme_notes/views/snippets/s_carousel_intro.xml
index dc39cd1fc..1e9648fbb 100644
--- a/theme_notes/views/snippets/s_carousel_intro.xml
+++ b/theme_notes/views/snippets/s_carousel_intro.xml
@@ -15,6 +15,10 @@
     <xpath expr="(//div[hasclass('carousel-item')])[3]" position="attributes">
         <attribute name="class" add="o_cc5" remove="o_cc1" separator=" "/>
     </xpath>
+    <xpath expr="//div[hasclass('carousel-item')][2]//div[hasclass('o_grid_item')][2]" position="attributes">
+        <attribute name="class" add="g-height-3" remove="g-height-2" separator=" "/>
+        <attribute name="style" add="grid-area: 6 / 7 / 9 / 11;" remove="grid-area: 7 / 7 / 9 / 11;" separator=";"/>
+    </xpath>
 
     <!-- Texts -->
     <xpath expr="//h1" position="replace" mode="inner">
diff --git a/theme_vehicle/views/customizations.xml b/theme_vehicle/views/customizations.xml
index f45e45656..303986252 100644
--- a/theme_vehicle/views/customizations.xml
+++ b/theme_vehicle/views/customizations.xml
@@ -562,6 +562,10 @@
 
 <!-- ======== CAROUSEL INTRO ======== -->
 <template id="s_carousel_intro" inherit_id="website.s_carousel_intro" name="Vehicle s_carousel_intro">
+    <xpath expr="//div[hasclass('carousel-item')][2]//div[hasclass('o_grid_item')][2]" position="attributes">
+        <attribute name="class" add="g-height-3" remove="g-height-2" separator=" "/>
+        <attribute name="style" add="grid-area: 6 / 7 / 9 / 11;" remove="grid-area: 7 / 7 / 9 / 11;" separator=";"/>
+    </xpath>
     <xpath expr="//h1" position="replace" mode="inner">
         Driving excellence with luxury vehicles
     </xpath>