From 266b35a31ed159124bd6a8195c7c166f85baac54 Mon Sep 17 00:00:00 2001
From: Benoit Socias <bso@odoo.com>
Date: Tue, 24 Sep 2024 14:48:00 +0200
Subject: [PATCH] [FIX] theme_*: fix duplicate inline styles

*: avantgarde, beauty, bistro, buzzy, clean, cobalt, graphene, kea, yes

This commit adapts the style attribute's add/remove operations in order
to avoid ending up with the same property defined several times.

task-4206845

Part-of: odoo/design-themes#933
Related: odoo/odoo#181194
Signed-off-by: Alice Gaudon (agau) <agau@odoo.com>
---
 theme_avantgarde/views/customizations.xml      | 2 +-
 theme_beauty/views/snippets/s_cover.xml        | 2 +-
 theme_bistro/views/snippets/s_cover.xml        | 2 +-
 theme_buzzy/views/snippets/s_big_number.xml    | 2 +-
 theme_clean/views/snippets/s_big_number.xml    | 2 +-
 theme_cobalt/views/customizations.xml          | 2 +-
 theme_graphene/views/customizations.xml        | 2 +-
 theme_kea/views/snippets/s_picture.xml         | 3 ---
 theme_yes/views/snippets/s_quotes_carousel.xml | 2 +-
 9 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/theme_avantgarde/views/customizations.xml b/theme_avantgarde/views/customizations.xml
index 96d1cf264..43bb0048a 100644
--- a/theme_avantgarde/views/customizations.xml
+++ b/theme_avantgarde/views/customizations.xml
@@ -16,7 +16,7 @@
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/18","flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="attributes">
-        <attribute name="style" remove="background-position: 50% 0;" add="background-position: 50% 80%;" separator=";"/>
+        <attribute name="style" remove="background-position: 50% 75%;" add="background-position: 50% 80%;" separator=";"/>
     </xpath>
     <xpath expr="//div[hasclass('s_allow_columns')]" position="before">
         <div class="o_we_shape o_web_editor_Origins_18" style="background-image: url('/web_editor/shape/web_editor/Origins/18.svg?c1=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
diff --git a/theme_beauty/views/snippets/s_cover.xml b/theme_beauty/views/snippets/s_cover.xml
index 5228b40db..893f2a49b 100644
--- a/theme_beauty/views/snippets/s_cover.xml
+++ b/theme_beauty/views/snippets/s_cover.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- Change position of background image -->
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="attributes">
-        <attribute name="style" add="background-position: 50% 50%;" remove="background-position: 50% 0;" separator=";"/>
+        <attribute name="style" add="background-position: 50% 50%;" remove="background-position: 50% 75%;" separator=";"/>
     </xpath>
     <!-- Filter -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="attributes">
diff --git a/theme_bistro/views/snippets/s_cover.xml b/theme_bistro/views/snippets/s_cover.xml
index 874dffa6a..b5f875ee3 100644
--- a/theme_bistro/views/snippets/s_cover.xml
+++ b/theme_bistro/views/snippets/s_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_cover" inherit_id="website.s_cover">
     <!-- Parallax -->
     <xpath expr="//*[hasclass('s_parallax_bg')]" position="attributes">
-        <attribute name="style" add="background-position: 50% 100%;" remove="background-position: 50% 0;" separator=";"/>
+        <attribute name="style" add="background-position: 50% 100%;" remove="background-position: 50% 75%;" separator=";"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
diff --git a/theme_buzzy/views/snippets/s_big_number.xml b/theme_buzzy/views/snippets/s_big_number.xml
index bf1121c72..57ad28177 100644
--- a/theme_buzzy/views/snippets/s_big_number.xml
+++ b/theme_buzzy/views/snippets/s_big_number.xml
@@ -18,7 +18,7 @@
         90%
     </xpath>
     <xpath expr="//h2/following-sibling::div" position="attributes">
-        <attribute name="style" add="font-size: 7.75rem;" remove="font-size: 10.75rem;" separator=";"/>
+        <attribute name="style" add="font-size: 7.75rem;" remove="font-size: 2.25rem;" separator=";"/>
     </xpath>
 </template>
 
diff --git a/theme_clean/views/snippets/s_big_number.xml b/theme_clean/views/snippets/s_big_number.xml
index bf1121c72..57ad28177 100644
--- a/theme_clean/views/snippets/s_big_number.xml
+++ b/theme_clean/views/snippets/s_big_number.xml
@@ -18,7 +18,7 @@
         90%
     </xpath>
     <xpath expr="//h2/following-sibling::div" position="attributes">
-        <attribute name="style" add="font-size: 7.75rem;" remove="font-size: 10.75rem;" separator=";"/>
+        <attribute name="style" add="font-size: 7.75rem;" remove="font-size: 2.25rem;" separator=";"/>
     </xpath>
 </template>
 
diff --git a/theme_cobalt/views/customizations.xml b/theme_cobalt/views/customizations.xml
index d18c7dd5e..cce9b329f 100644
--- a/theme_cobalt/views/customizations.xml
+++ b/theme_cobalt/views/customizations.xml
@@ -526,7 +526,7 @@
         90%
     </xpath>
     <xpath expr="//h2/following-sibling::div" position="attributes">
-        <attribute name="style" add="font-size: 7.75rem;" remove="font-size: 10.75rem;" separator=";"/>
+        <attribute name="style" add="font-size: 7.75rem;" remove="font-size: 2.25rem;" separator=";"/>
     </xpath>
 </template>
 
diff --git a/theme_graphene/views/customizations.xml b/theme_graphene/views/customizations.xml
index 3afc95097..574264f3f 100644
--- a/theme_graphene/views/customizations.xml
+++ b/theme_graphene/views/customizations.xml
@@ -591,7 +591,7 @@
         90%
     </xpath>
     <xpath expr="//h2/following-sibling::div" position="attributes">
-        <attribute name="style" add="font-size: 7.75rem;" remove="font-size: 10.75rem;" separator=";"/>
+        <attribute name="style" add="font-size: 7.75rem;" remove="font-size: 2.25rem;" separator=";"/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_picture.xml b/theme_kea/views/snippets/s_picture.xml
index 4be986032..f1b173b12 100644
--- a/theme_kea/views/snippets/s_picture.xml
+++ b/theme_kea/views/snippets/s_picture.xml
@@ -21,9 +21,6 @@
     <xpath expr="//p" position="replace" mode="inner">
         Put yourself at the center of an extraordinary gaming universe with exclusive games.
     </xpath>
-    <xpath expr="//p" position="attributes">
-        <attribute name="style" add="text-align: center;" separator=";"/>
-    </xpath>
     <!-- Caption -->
     <xpath expr="//figcaption" position="replace">
         <figcaption class="figure-caption text-muted py-3">Watch as a living game world comes alive all around you, with a seamless field of view wherever you look.</figcaption>
diff --git a/theme_yes/views/snippets/s_quotes_carousel.xml b/theme_yes/views/snippets/s_quotes_carousel.xml
index 699020934..a71bf276b 100644
--- a/theme_yes/views/snippets/s_quotes_carousel.xml
+++ b/theme_yes/views/snippets/s_quotes_carousel.xml
@@ -7,7 +7,7 @@
     </xpath>
     <!-- Quote 1 -->
     <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
-        <attribute name="style" add="background-image: url('/web/image/website.s_quotes_carousel_demo_image_0'); background-position: 50% 25%;" separator=";"/>
+        <attribute name="style" remove="background-position: 50% 50%;" add="background-position: 50% 25%;" separator=";"/>
     </xpath>
     <xpath expr="//blockquote" position="before">
         <div class="o_we_bg_filter" style="background-color: rgba(25, 41, 37, 0.55) !important;"/>