From 85946a8b913b8f369ee762937b33d07bf8a88a1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Souk=C3=A9ina=20Bojabza?= <sobo@odoo.com>
Date: Mon, 23 Sep 2024 16:48:05 +0000
Subject: [PATCH] [FIX] theme_*: adapt `s_card_offset` without `display: flex`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

*: anelusia, avantgarde, beauty, bistro, bookstore, enark, kiddo,
loftspace, monglia, nano, notes, odoo_experts, paptic, real_estate,
treehouse, yes, zap

In the community PR, the `s_card_offset` snippet has been modified in
order to not be in `display: flex` anymore. The visual was then kept as
close as possible to how it was before by using the grid padding.

This commit adapts this snippet customizations to these changes. More
precisely, it adapts the vertical padding to the text content, in order
to center it a bit while avoiding having an overflow.

Related to task-4105038

X-original-commit: 127a07fdc5f74779077a36b5530d7941733ef44d
Part-of: odoo/design-themes#955
Related: odoo/odoo#181816
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Signed-off-by: Soukéina Bojabza (sobo) <sobo@odoo.com>
---
 .../views/snippets/s_card_offset.xml          |  4 +++
 theme_avantgarde/views/customizations.xml     |  4 +++
 theme_beauty/views/snippets/s_card_offset.xml |  4 +++
 theme_bistro/views/snippets/s_card_offset.xml |  4 +++
 .../views/snippets/s_card_offset.xml          |  4 +++
 theme_enark/views/snippets/s_card_offset.xml  |  4 +++
 theme_kiddo/views/snippets/s_card_offset.xml  |  4 +++
 .../views/snippets/s_card_offset.xml          |  4 +++
 theme_monglia/views/customizations.xml        |  4 +++
 theme_nano/views/snippets/s_card_offset.xml   |  4 +++
 theme_notes/views/snippets/s_card_offset.xml  |  4 +++
 .../views/snippets/s_card_offset.xml          |  4 +++
 theme_paptic/views/customizations.xml         | 35 +++++++++----------
 .../views/snippets/s_card_offset.xml          |  4 +++
 .../views/snippets/s_card_offset.xml          |  4 +++
 theme_yes/views/snippets/s_card_offset.xml    |  4 +++
 theme_zap/views/snippets/s_card_offset.xml    |  4 +++
 17 files changed, 81 insertions(+), 18 deletions(-)

diff --git a/theme_anelusia/views/snippets/s_card_offset.xml b/theme_anelusia/views/snippets/s_card_offset.xml
index 20b9360a0..836634d1d 100644
--- a/theme_anelusia/views/snippets/s_card_offset.xml
+++ b/theme_anelusia/views/snippets/s_card_offset.xml
@@ -2,6 +2,10 @@
 <odoo>
 
 <template id="s_card_offset" inherit_id="website.s_card_offset">
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 56px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.s_carousel_default_image_3</attribute>
diff --git a/theme_avantgarde/views/customizations.xml b/theme_avantgarde/views/customizations.xml
index 43bb0048a..43ef2bf8f 100644
--- a/theme_avantgarde/views/customizations.xml
+++ b/theme_avantgarde/views/customizations.xml
@@ -523,6 +523,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 56px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.s_carousel_default_image_3</attribute>
diff --git a/theme_beauty/views/snippets/s_card_offset.xml b/theme_beauty/views/snippets/s_card_offset.xml
index 68af4b066..e6a8f4baf 100644
--- a/theme_beauty/views/snippets/s_card_offset.xml
+++ b/theme_beauty/views/snippets/s_card_offset.xml
@@ -6,6 +6,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 56px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.s_carousel_default_image_3</attribute>
diff --git a/theme_bistro/views/snippets/s_card_offset.xml b/theme_bistro/views/snippets/s_card_offset.xml
index 42170d2e6..08245875e 100644
--- a/theme_bistro/views/snippets/s_card_offset.xml
+++ b/theme_bistro/views/snippets/s_card_offset.xml
@@ -6,6 +6,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5 o_colored_level" remove="o_cc1" separator=" "/>
     </xpath>
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 60px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.s_carousel_default_image_3</attribute>
diff --git a/theme_bookstore/views/snippets/s_card_offset.xml b/theme_bookstore/views/snippets/s_card_offset.xml
index 333bd50d9..c9c9af1e1 100644
--- a/theme_bookstore/views/snippets/s_card_offset.xml
+++ b/theme_bookstore/views/snippets/s_card_offset.xml
@@ -2,6 +2,10 @@
 <odoo>
 
 <template id="s_card_offset" inherit_id="website.s_card_offset">
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 56px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.s_carousel_default_image_3</attribute>
diff --git a/theme_enark/views/snippets/s_card_offset.xml b/theme_enark/views/snippets/s_card_offset.xml
index b33a5cb24..f575e1a95 100644
--- a/theme_enark/views/snippets/s_card_offset.xml
+++ b/theme_enark/views/snippets/s_card_offset.xml
@@ -6,6 +6,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5 o_colored_level" remove="o_cc1" separator=" "/>
     </xpath>
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 56px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.library_image_13</attribute>
diff --git a/theme_kiddo/views/snippets/s_card_offset.xml b/theme_kiddo/views/snippets/s_card_offset.xml
index 4afb203ba..e05b986b2 100644
--- a/theme_kiddo/views/snippets/s_card_offset.xml
+++ b/theme_kiddo/views/snippets/s_card_offset.xml
@@ -2,6 +2,10 @@
 <odoo>
 
 <template id="s_card_offset" inherit_id="website.s_card_offset">
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 56px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.s_carousel_default_image_3</attribute>
diff --git a/theme_loftspace/views/snippets/s_card_offset.xml b/theme_loftspace/views/snippets/s_card_offset.xml
index e9c368a87..c53130c1d 100644
--- a/theme_loftspace/views/snippets/s_card_offset.xml
+++ b/theme_loftspace/views/snippets/s_card_offset.xml
@@ -6,6 +6,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 56px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.s_carousel_default_image_3</attribute>
diff --git a/theme_monglia/views/customizations.xml b/theme_monglia/views/customizations.xml
index 6930efb86..28728fc49 100644
--- a/theme_monglia/views/customizations.xml
+++ b/theme_monglia/views/customizations.xml
@@ -723,6 +723,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 48px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.s_carousel_default_image_3</attribute>
diff --git a/theme_nano/views/snippets/s_card_offset.xml b/theme_nano/views/snippets/s_card_offset.xml
index 734523bf7..02f99dce3 100644
--- a/theme_nano/views/snippets/s_card_offset.xml
+++ b/theme_nano/views/snippets/s_card_offset.xml
@@ -6,6 +6,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5 o_colored_level" remove="o_cc1" separator=" "/>
     </xpath>
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 32px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.library_image_03</attribute>
diff --git a/theme_notes/views/snippets/s_card_offset.xml b/theme_notes/views/snippets/s_card_offset.xml
index 45e1e6a7f..edfca1026 100644
--- a/theme_notes/views/snippets/s_card_offset.xml
+++ b/theme_notes/views/snippets/s_card_offset.xml
@@ -2,6 +2,10 @@
 <odoo>
 
 <template id="s_card_offset" inherit_id="website.s_card_offset">
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 72px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.s_carousel_default_image_3</attribute>
diff --git a/theme_odoo_experts/views/snippets/s_card_offset.xml b/theme_odoo_experts/views/snippets/s_card_offset.xml
index 6d8350d05..800f648ff 100644
--- a/theme_odoo_experts/views/snippets/s_card_offset.xml
+++ b/theme_odoo_experts/views/snippets/s_card_offset.xml
@@ -2,6 +2,10 @@
 <odoo>
 
 <template id="s_card_offset" inherit_id="website.s_card_offset">
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 48px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.s_carousel_default_image_3</attribute>
diff --git a/theme_paptic/views/customizations.xml b/theme_paptic/views/customizations.xml
index 79180fbb6..9651a740b 100644
--- a/theme_paptic/views/customizations.xml
+++ b/theme_paptic/views/customizations.xml
@@ -723,10 +723,26 @@
 
 <!-- ======== CARD OFFSET ======== -->
 <template id="s_card_offset" inherit_id="website.s_card_offset">
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 64px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.s_carousel_default_image_3</attribute>
     </xpath>
+    <!-- Title -->
+    <xpath expr="//h3" position="replace" mode="inner">
+        Expert Consultancy in Tech &amp; Design
+    </xpath>
+    <!-- Paragraph 1 -->
+    <xpath expr="(//p[hasclass('lead')])[1]" position="replace" mode="inner">
+        Optimize your business with our consultancy services in technology and design. We provide strategic advice and innovative solutions to help you stay ahead in the digital age.
+    </xpath>
+    <!-- Paragraph 2 -->
+    <xpath expr="(//p[hasclass('lead')])[2]" position="replace" mode="inner">
+        Unlock your business potential.
+    </xpath>
 </template>
 
 <!-- ==== Big Number ===== -->
@@ -762,24 +778,7 @@
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
 </template>
-<template id="s_card_offset" inherit_id="website.s_card_offset">
-    <!-- Image -->
-    <xpath expr="//img" position="attributes">
-        <attribute name="src">/web/image/website.s_carousel_default_image_3</attribute>
-    </xpath>
-    <!-- Title -->
-    <xpath expr="//h3" position="replace" mode="inner">
-        Expert Consultancy in Tech &amp; Design
-    </xpath>
-    <!-- Paragraph 1 -->
-    <xpath expr="(//p[hasclass('lead')])[1]" position="replace" mode="inner">
-        Optimize your business with our consultancy services in technology and design. We provide strategic advice and innovative solutions to help you stay ahead in the digital age.
-    </xpath>
-    <!-- Paragraph 2 -->
-    <xpath expr="(//p[hasclass('lead')])[2]" position="replace" mode="inner">
-        Unlock your business potential.
-    </xpath>
-</template>
+
 <!-- ==== Cards Grid ===== -->
 <template id="s_cards_grid" inherit_id="website.s_cards_grid">
     <!-- Card 1 -->
diff --git a/theme_real_estate/views/snippets/s_card_offset.xml b/theme_real_estate/views/snippets/s_card_offset.xml
index 5c21df852..9f33622b1 100644
--- a/theme_real_estate/views/snippets/s_card_offset.xml
+++ b/theme_real_estate/views/snippets/s_card_offset.xml
@@ -6,6 +6,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 64px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.library_image_16</attribute>
diff --git a/theme_treehouse/views/snippets/s_card_offset.xml b/theme_treehouse/views/snippets/s_card_offset.xml
index 4185b2204..fa202aecc 100644
--- a/theme_treehouse/views/snippets/s_card_offset.xml
+++ b/theme_treehouse/views/snippets/s_card_offset.xml
@@ -2,6 +2,10 @@
 <odoo>
 
 <template id="s_card_offset" inherit_id="website.s_card_offset">
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 56px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.s_carousel_default_image_3</attribute>
diff --git a/theme_yes/views/snippets/s_card_offset.xml b/theme_yes/views/snippets/s_card_offset.xml
index 8be103bc9..634c5baa4 100644
--- a/theme_yes/views/snippets/s_card_offset.xml
+++ b/theme_yes/views/snippets/s_card_offset.xml
@@ -6,6 +6,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5 o_colored_level" remove="o_cc1" separator=" "/>
     </xpath>
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 52px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.s_carousel_default_image_3</attribute>
diff --git a/theme_zap/views/snippets/s_card_offset.xml b/theme_zap/views/snippets/s_card_offset.xml
index 62a867a47..4eca80fa1 100644
--- a/theme_zap/views/snippets/s_card_offset.xml
+++ b/theme_zap/views/snippets/s_card_offset.xml
@@ -2,6 +2,10 @@
 <odoo>
 
 <template id="s_card_offset" inherit_id="website.s_card_offset">
+    <!-- Grid items -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="--grid-item-padding-y: 48px;" remove="--grid-item-padding-y: 40px;" separator=";"/>
+    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web/image/website.s_carousel_default_image_3</attribute>