From d60776bdd239721af02bb1db7030b7e94ff6c59a Mon Sep 17 00:00:00 2001
From: Benjamin Vray <bvr@odoo.com>
Date: Wed, 4 Sep 2024 11:36:42 +0200
Subject: [PATCH] [FIX] theme_*: fix font style of snippet headers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some snippets contain incorrect font style that are not achievable using
the editor (for example: <h2 class="display-3"> in the "Key benefits"
snippet).

These snippets were adapted in the community commit linked to this one
to align with what the editor would generate if we recreated them from
scratch.

In this commit, we adapt the themes following the change in community.
We also fix a few issues (e.g., wording for the ´s_numbers´ snippet)
noticed during the changes.

task-4148057

closes odoo/design-themes#895

Related: odoo/odoo#178957
Signed-off-by: Robin Lejeune (role) <role@odoo.com>
---
 theme_bewise/views/customizations.xml         |  9 ++++--
 theme_bookstore/views/snippets/s_numbers.xml  | 18 +++++++----
 theme_graphene/views/customizations.xml       | 10 ------
 theme_kea/views/snippets/s_numbers.xml        | 11 ++++---
 theme_notes/views/snippets/s_numbers.xml      | 31 ++++++++++++-------
 .../views/snippets/s_numbers.xml              | 12 +++----
 .../views/snippets/s_numbers.xml              | 16 +++++-----
 theme_zap/views/new_page_template.xml         |  4 +--
 theme_zap/views/snippets/s_numbers.xml        | 27 ++++++++++------
 9 files changed, 77 insertions(+), 61 deletions(-)

diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml
index 2f5a2579a..09d54d2d9 100644
--- a/theme_bewise/views/customizations.xml
+++ b/theme_bewise/views/customizations.xml
@@ -124,13 +124,16 @@
     <xpath expr="//section/div" position="before">
         <div class="o_we_shape o_web_editor_Blobs_11" style="background-image: url('/web_editor/shape/web_editor/Blobs/11.svg?c1=o-color-1&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
-    <xpath expr="//h6" position="replace" mode="inner">
+    <xpath expr="//span[hasclass('h5-fs')]" position="replace" mode="inner">
         Faculties
     </xpath>
-    <xpath expr="//div[hasclass('row')]/div[2]/h6" position="replace" mode="inner">
+    <xpath expr="(//span[hasclass('s_number')])[2]" position="replace" mode="inner">
+        47
+    </xpath>
+    <xpath expr="(//span[hasclass('h5-fs')])[2]" position="replace" mode="inner">
         Nationalities
     </xpath>
-    <xpath expr="//div[hasclass('row')]/div[3]/h6" position="replace" mode="inner">
+    <xpath expr="(//span[hasclass('h5-fs')])[3]" position="replace" mode="inner">
         Libraries
     </xpath>
 </template>
diff --git a/theme_bookstore/views/snippets/s_numbers.xml b/theme_bookstore/views/snippets/s_numbers.xml
index eff732664..d42d9d43d 100644
--- a/theme_bookstore/views/snippets/s_numbers.xml
+++ b/theme_bookstore/views/snippets/s_numbers.xml
@@ -12,14 +12,20 @@
         <div class="o_we_shape o_web_editor_Floats_12"/>
     </xpath>
     <!-- Titles -->
-    <xpath expr="//h6" position="replace" mode="inner">
-        Useful options
+    <xpath expr="//span[hasclass('h5-fs')]" position="replace" mode="inner">
+        Unique references
     </xpath>
-    <xpath expr="//h6" position="replace" mode="inner">
-        Beautiful snippets
+    <xpath expr="(//span[hasclass('s_number')])[2]" position="replace" mode="inner">
+        98%
     </xpath>
-    <xpath expr="//h6" position="replace" mode="inner">
-        Amazing pages
+    <xpath expr="(//span[hasclass('h5-fs')])[2]" position="replace" mode="inner">
+        Happy customers
+    </xpath>
+    <xpath expr="(//span[hasclass('s_number')])[3]" position="replace" mode="inner">
+        418
+    </xpath>
+    <xpath expr="(//span[hasclass('h5-fs')])[3]" position="replace" mode="inner">
+        Stores around the world
     </xpath>
 </template>
 
diff --git a/theme_graphene/views/customizations.xml b/theme_graphene/views/customizations.xml
index acd423835..ed3a2a8c4 100644
--- a/theme_graphene/views/customizations.xml
+++ b/theme_graphene/views/customizations.xml
@@ -248,16 +248,6 @@
         <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_parallax_default_image'); background-position: 50% 75%;"/>
         <div class="o_we_bg_filter bg-black-75"></div>
     </xpath>
-    <!-- Content -->
-    <xpath expr="//div[hasclass('row')]/div/span" position="attributes">
-        <attribute name="class" add="text-white" separator=" "/>
-    </xpath>
-    <xpath expr="(//div[hasclass('row')]/div/span)[2]" position="attributes">
-        <attribute name="class" add="text-white" separator=" "/>
-    </xpath>
-    <xpath expr="(//div[hasclass('row')]/div/span)[3]" position="attributes">
-        <attribute name="class" add="text-white" separator=" "/>
-    </xpath>
 </template>
 
 <!-- ======== PICTURE ======== -->
diff --git a/theme_kea/views/snippets/s_numbers.xml b/theme_kea/views/snippets/s_numbers.xml
index 8f89b9fcf..e3538f3b8 100644
--- a/theme_kea/views/snippets/s_numbers.xml
+++ b/theme_kea/views/snippets/s_numbers.xml
@@ -6,14 +6,17 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt0 pb48" remove="pt80 pb80" separator=" "/>
     </xpath>
-    <!-- Replace h6 by paragraphs -->
-    <xpath expr="//h6" position="replace" mode="inner">
+    <!-- Replace texts -->
+    <xpath expr="//span[hasclass('h5-fs')]" position="replace" mode="inner">
         Different lenses
     </xpath>
-    <xpath expr="(//h6)[2]" position="replace" mode="inner">
+    <xpath expr="(//span[hasclass('s_number')])[2]" position="replace" mode="inner">
+        256
+    </xpath>
+    <xpath expr="(//span[hasclass('h5-fs')])[2]" position="replace" mode="inner">
         Storage capacity (GB)
     </xpath>
-    <xpath expr="(//h6)[3]" position="replace" mode="inner">
+    <xpath expr="(//span[hasclass('h5-fs')])[3]" position="replace" mode="inner">
         Number of controllers
     </xpath>
 </template>
diff --git a/theme_notes/views/snippets/s_numbers.xml b/theme_notes/views/snippets/s_numbers.xml
index ede3d03c3..e54ddb550 100644
--- a/theme_notes/views/snippets/s_numbers.xml
+++ b/theme_notes/views/snippets/s_numbers.xml
@@ -12,26 +12,33 @@
     </xpath>
     <!-- Column #1 -->
     <xpath expr="//div[hasclass('col-lg-4')]" position="attributes">
-        <attribute name="class" add="pt104 pb104 o_cc o_cc5" remove="pt24 pb24" separator=" "/>
-    </xpath>
-    <!-- Column #1 - Text -->
-    <xpath expr="//h6" position="replace" mode="inner">
-        Editions through the Europe
+        <attribute name="class" add="pt104 pb64 o_cc o_cc5" separator=" "/>
     </xpath>
     <!-- Column #2 -->
-    <xpath expr="//div[hasclass('col-lg-4')][2]" position="attributes">
-        <attribute name="class" add="pt104 pb104 o_cc o_cc2" remove="pt24 pb24" separator=" "/>
+    <xpath expr="(//div[hasclass('col-lg-4')])[2]" position="attributes">
+        <attribute name="class" add="pt104 pb104 o_cc o_cc1" remove="pt24 pb24" separator=" "/>
     </xpath>
     <!-- Column #2 - Text -->
-    <xpath expr="(//h6)[2]" position="replace" mode="inner">
-        Artists from around the world
+   <xpath expr="//span[hasclass('h5-fs')]" position="replace" mode="inner">
+        Editions through the Europe
     </xpath>
     <!-- Column #3 -->
-    <xpath expr="//div[hasclass('col-lg-4')][3]" position="attributes">
-        <attribute name="class" add="pt104 pb104 o_cc o_cc3" remove="pt24 pb24" separator=" "/>
+    <xpath expr="(//div[hasclass('col-lg-4')])[3]" position="attributes">
+        <attribute name="class" add="pt104 pb104 o_cc o_cc2" remove="pt24 pb24" separator=" "/>
     </xpath>
     <!-- Column #3 - Text -->
-    <xpath expr="(//h6)[3]" position="replace" mode="inner">
+    <xpath expr="(//span[hasclass('s_number')])[2]" position="replace" mode="inner">
+        72
+    </xpath>
+    <xpath expr="(//span[hasclass('h5-fs')])[2]" position="replace" mode="inner">
+        Artists from around the world
+    </xpath>
+    <!-- Column #4 -->
+    <xpath expr="(//div[hasclass('col-lg-4')])[4]" position="attributes">
+        <attribute name="class" add="pt104 pb104 o_cc o_cc3" remove="pt24 pb24" separator=" "/>
+    </xpath>
+    <!-- Column #4 - Text -->
+    <xpath expr="(//span[hasclass('h5-fs')])[3]" position="replace" mode="inner">
         Scenes outdoor &amp; indoor
     </xpath>
 </template>
diff --git a/theme_odoo_experts/views/snippets/s_numbers.xml b/theme_odoo_experts/views/snippets/s_numbers.xml
index 6761bc715..9def5461c 100644
--- a/theme_odoo_experts/views/snippets/s_numbers.xml
+++ b/theme_odoo_experts/views/snippets/s_numbers.xml
@@ -8,14 +8,14 @@
         <attribute name="style">background-image:url('/web_editor/shape/theme_odoo_experts/s_numbers.svg?c1=o-color-1');</attribute>
     </xpath>
     <!-- Numbers -->
-    <xpath expr="//span[hasclass('s_number')]" position="replace" mode="inner">
-        <b>12</b>
+    <xpath expr="//span[hasclass('h5-fs')]" position="replace" mode="inner">
+        <strong>Useful options</strong>
     </xpath>
-    <xpath expr="(//span[hasclass('s_number')])[2]" position="replace" mode="inner">
-        <b>45</b>
+    <xpath expr="(//span[hasclass('h5-fs')])[2]" position="replace" mode="inner">
+        <strong>More leads</strong>
     </xpath>
-    <xpath expr="(//span[hasclass('s_number')])[3]" position="replace" mode="inner">
-        <b>8</b>
+    <xpath expr="(//span[hasclass('h5-fs')])[3]" position="replace" mode="inner">
+        <strong>Amazing pages</strong>
     </xpath>
 </template>
 
diff --git a/theme_real_estate/views/snippets/s_numbers.xml b/theme_real_estate/views/snippets/s_numbers.xml
index 513910510..63a9c09d8 100644
--- a/theme_real_estate/views/snippets/s_numbers.xml
+++ b/theme_real_estate/views/snippets/s_numbers.xml
@@ -7,24 +7,24 @@
         <attribute name="class" add="pt32 pb56" remove="pt80 pb80" separator=" "/>
     </xpath>
     <!-- Column #01 -->
-    <xpath expr="//div[hasclass('col-lg-4')][1]/h6" position="replace" mode="inner">
+    <xpath expr="//span[hasclass('h5-fs')]" position="replace" mode="inner">
         properties already sold
     </xpath>
-    <xpath expr="//div[hasclass('col-lg-4')][1]/span" position="replace" mode="inner">
-        14,000
+    <xpath expr="//span[hasclass('s_number')]" position="replace" mode="inner">
+        14K
     </xpath>
     <!-- Column #02 -->
-    <xpath expr="//div[hasclass('col-lg-4')][2]/span" position="replace" mode="inner">
-        97%
+    <xpath expr="(//span[hasclass('s_number')])[2]" position="replace" mode="inner">
+        98%
     </xpath>
-    <xpath expr="//div[hasclass('col-lg-4')][2]/h6" position="replace" mode="inner">
+    <xpath expr="(//span[hasclass('h5-fs')])[2]" position="replace" mode="inner">
         happy customers
     </xpath>
     <!-- Column #03 -->
-    <xpath expr="//div[hasclass('col-lg-4')][3]/span" position="replace" mode="inner">
+    <xpath expr="(//span[hasclass('s_number')])[3]" position="replace" mode="inner">
         142
     </xpath>
-    <xpath expr="//div[hasclass('col-lg-4')][3]/h6" position="replace" mode="inner">
+    <xpath expr="(//span[hasclass('h5-fs')])[3]" position="replace" mode="inner">
         amazing agents
     </xpath>
 </template>
diff --git a/theme_zap/views/new_page_template.xml b/theme_zap/views/new_page_template.xml
index 79481a894..f47752282 100644
--- a/theme_zap/views/new_page_template.xml
+++ b/theme_zap/views/new_page_template.xml
@@ -46,7 +46,7 @@
 
 <template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
+        <attribute name="class" remove="o_cc3" separator=" "/>
     </xpath>
 </template>
 
@@ -59,7 +59,7 @@
 <template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
     <xpath expr="//section" position="attributes">
         <!-- o_colored_level is defined by both theme and new page template -->
-        <attribute name="class" add="o_cc2 o_colored_level" remove="o_cc3 o_colored_level pt0" separator=" "/>
+        <attribute name="class" add="pt64" remove="o_cc3 o_colored_level pt0" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_zap/views/snippets/s_numbers.xml b/theme_zap/views/snippets/s_numbers.xml
index 13ed8c7ba..bdf912635 100644
--- a/theme_zap/views/snippets/s_numbers.xml
+++ b/theme_zap/views/snippets/s_numbers.xml
@@ -2,28 +2,35 @@
 <odoo>
 
 <template id="s_numbers" inherit_id="website.s_numbers">
-    <!-- Column #01 -->
-    <xpath expr="//*[hasclass('row')]/*[1]" position="attributes">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc2" remove="o_cc1" separator=" "/>
+    </xpath>
+    <!-- Column #2 -->
+    <xpath expr="(//div[hasclass('col-lg-4')])[2]" position="attributes">
         <attribute name="class" add="o_cc o_cc1 rounded pt64 pb64" remove="pt24 pb24" separator=" "/>
         <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
     </xpath>
-    <xpath expr="(//h6)[1]" position="replace" mode="inner">
+    <xpath expr="//span[hasclass('h5-fs')]" position="replace" mode="inner">
         <font class="text-o-color-1">Solutions</font>
     </xpath>
-    <!-- Column #02 -->
-    <xpath expr="//*[hasclass('row')]/*[2]" position="attributes">
+    <!-- Column #3 -->
+    <xpath expr="(//div[hasclass('col-lg-4')])[3]" position="attributes">
         <attribute name="class" add="o_cc o_cc1 rounded pt64 pb64" remove="pt24 pb24" separator=" "/>
         <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
     </xpath>
-    <xpath expr="(//h6)[2]" position="replace" mode="inner">
-        <font class="text-o-color-1">Customers</font>
+    <xpath expr="(//span[hasclass('s_number')])[2]" position="replace" mode="inner">
+        98%
     </xpath>
-    <!-- Column #03 -->
-    <xpath expr="//*[hasclass('row')]/*[3]" position="attributes">
+    <xpath expr="(//span[hasclass('h5-fs')])[2]" position="replace" mode="inner">
+        <font class="text-o-color-1">Happy customers</font>
+    </xpath>
+    <!-- Column #4 -->
+    <xpath expr="(//div[hasclass('col-lg-4')])[4]" position="attributes">
         <attribute name="class" add="o_cc o_cc1 rounded pt64 pb64" remove="pt24 pb24" separator=" "/>
         <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
     </xpath>
-    <xpath expr="(//h6)[3]" position="replace" mode="inner">
+    <xpath expr="(//span[hasclass('h5-fs')])[3]" position="replace" mode="inner">
         <font class="text-o-color-1">Languages</font>
     </xpath>
 </template>