From 6c79fc30a7e72abb5936bbc561d3aab0cb6f3da7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Souk=C3=A9ina=20Bojabza?= <sobo@odoo.com>
Date: Tue, 24 May 2022 15:11:22 +0000
Subject: [PATCH] [IMP] theme_*: remove some snippets hard coded background
 color

This is the direct following of the PR [1].

Some themes "hard code" the background colors of some snippets, which
prevents the user to change it with a preset color without deleting the
current background first.

This commit does two things:
- remove the problematic hard coded background colors;
- replace the colors that are removed by some themes by the ones that
were set in [1] (for the searchbar and text highlight snippets).

[1]: https://github.com/odoo/odoo/pull/90749

task-2824393

closes odoo/design-themes#604

X-original-commit: 7d193e0560a71b200409e1b71c58b3af84dc3aff
Related: odoo/odoo#103123
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
---
 theme_bistro/views/snippets/s_image_text.xml       | 2 +-
 theme_bistro/views/snippets/s_text_image.xml       | 2 +-
 theme_buzzy/views/snippets/s_text_highlight.xml    | 2 +-
 theme_cobalt/views/customizations.xml              | 2 +-
 theme_treehouse/views/snippets/s_image_text.xml    | 2 +-
 theme_treehouse/views/snippets/s_three_columns.xml | 2 +-
 theme_zap/views/snippets/s_image_text.xml          | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/theme_bistro/views/snippets/s_image_text.xml b/theme_bistro/views/snippets/s_image_text.xml
index 10aef932b..58b8cbeb0 100644
--- a/theme_bistro/views/snippets/s_image_text.xml
+++ b/theme_bistro/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt64 pb64 bg-200" remove="pt32 pb32" separator=" "/>
+        <attribute name="class" add="pt64 pb64" remove="pt32 pb32" separator=" "/>
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
diff --git a/theme_bistro/views/snippets/s_text_image.xml b/theme_bistro/views/snippets/s_text_image.xml
index b222f29b5..4e910efe5 100644
--- a/theme_bistro/views/snippets/s_text_image.xml
+++ b/theme_bistro/views/snippets/s_text_image.xml
@@ -4,7 +4,7 @@
 <template id="s_text_image" inherit_id="website.s_text_image">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt80 pb80 bg-200" remove="o_cc o_cc2 pt32 pb32" separator=" "/>
+        <attribute name="class" add="pt80 pb80" remove="o_cc o_cc2 pt32 pb32" separator=" "/>
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
diff --git a/theme_buzzy/views/snippets/s_text_highlight.xml b/theme_buzzy/views/snippets/s_text_highlight.xml
index 3789b9924..71733658b 100644
--- a/theme_buzzy/views/snippets/s_text_highlight.xml
+++ b/theme_buzzy/views/snippets/s_text_highlight.xml
@@ -4,7 +4,7 @@
 <template id="s_text_highlight" inherit_id="website.s_text_highlight">
     <!-- Main div -->
     <xpath expr="//div[hasclass('s_text_highlight')]" position="attributes">
-        <attribute name="class" add="o_cc o_cc4" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_cobalt/views/customizations.xml b/theme_cobalt/views/customizations.xml
index 46b002805..033e1bd83 100644
--- a/theme_cobalt/views/customizations.xml
+++ b/theme_cobalt/views/customizations.xml
@@ -159,7 +159,7 @@
 <!-- ==== Picture ===== -->
 <template id="s_picture" inherit_id="website.s_picture" name="Cobalt s_picture">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="bg-o-color-3 pt72 overflow-hidden" remove="o_cc o_cc2 pt48" separator=" "/>
+        <attribute name="class" add="pt72 overflow-hidden" remove="o_cc o_cc2 pt48" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
diff --git a/theme_treehouse/views/snippets/s_image_text.xml b/theme_treehouse/views/snippets/s_image_text.xml
index 3ee55243f..6654ee0a6 100644
--- a/theme_treehouse/views/snippets/s_image_text.xml
+++ b/theme_treehouse/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt80 pb80 bg-200" remove="pt32 pb32" separator=" "/>
+        <attribute name="class" add="pt80 pb80" remove="pt32 pb32" separator=" "/>
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
diff --git a/theme_treehouse/views/snippets/s_three_columns.xml b/theme_treehouse/views/snippets/s_three_columns.xml
index eb11fed6a..dde1e2e8a 100644
--- a/theme_treehouse/views/snippets/s_three_columns.xml
+++ b/theme_treehouse/views/snippets/s_three_columns.xml
@@ -4,7 +4,7 @@
 <template id="s_three_columns" inherit_id="website.s_three_columns">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt80 pb80 bg-200" remove="pt32 pb32 o_cc o_cc2" separator=" "/>
+        <attribute name="class" add="pt80 pb80" remove="pt32 pb32 o_cc o_cc2" separator=" "/>
     </xpath>
     <!-- Column #01 -->
     <xpath expr="(//*[hasclass('card-title')])[1]" position="replace" mode="inner">
diff --git a/theme_zap/views/snippets/s_image_text.xml b/theme_zap/views/snippets/s_image_text.xml
index 3ee55243f..345af537f 100644
--- a/theme_zap/views/snippets/s_image_text.xml
+++ b/theme_zap/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt80 pb80 bg-200" remove="pt32 pb32" separator=" "/>
+        <attribute name="class" add="pt80 pb80 o_colored_level o_cc o_cc2" remove="pt32 pb32" separator=" "/>
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">