[FIX] theme_*: remove duplicate and conflicting classes

When default snippets have been updated to rely on color presets ([1]),
some themes were not adapted accordingly.
This also happened whenever paddings of base blocks were modified.
Because of this there are elements in themes for which some classes are
applied several times, and some where classes are not removed before
adding a contradicting one.

This commit adjusts the classes so that themes neither:
- produce snippets with duplicated classes
- produce snippets with contradicting classes (e.g. two different
bottom paddings on the same element)

This commit also fixes a typo from [2] which was the source of
duplicate classes.

[1]: odoo/odoo@5953c4d
[2]: odoo@299d504#diff-86c142838104de06e89f629c51cf791464538dc8899e6a3f00c24f69638db409R34

task-3562147

X-original-commit: f3da06d
Part-of: odoo#744

Author: bso-odoo

theme_anelusia/views/snippets/s_call_to_action.xml

@@ -34,9 +34,6 @@
     <xpath expr="(//p)[2]" position="attributes">
         <attribute name="style">text-align: center;</attribute>
     </xpath>
-    <xpath expr="//a[hasclass('btn')]" position="attributes">
-        <attribute name="class" add="btn-lg" separator=" "/>
-    </xpath>
     <xpath expr="//a[hasclass('btn')]/t" position="replace" mode="inner">
         Discover it
     </xpath>

theme_anelusia/views/snippets/s_company_team.xml

@@ -4,7 +4,7 @@
 <template id="s_company_team" inherit_id="website.s_company_team">
     <!-- Section -->
     <xpath expr="section" position="attributes">
-        <attribute name="class" add="pt64 pb64" remove="pt48 pb24" separator=" "/>
+        <attribute name="class" add="pt64 pb64" remove="pt48 pb48" separator=" "/>
     </xpath>
 
     <!-- Team #01 -->

theme_artists/views/snippets/s_carousel.xml

@@ -42,7 +42,7 @@
 
     <!-- Carousel-item #03 -->
     <xpath expr="//div[hasclass('carousel-item')][3]" position="attributes">
-        <attribute name="class" add="o_cc o_cc5 pt152 pb152" remove="pb112 pt112" separator=" "/>
+        <attribute name="class" add="o_cc o_cc5 pt152 pb152" remove="pb128 pt128" separator=" "/>
     </xpath>
     <!-- Shape & filter -->
     <xpath expr="//div[hasclass('carousel-item')][3]//div[hasclass('container')]" position="before">

theme_artists/views/snippets/s_comparisons.xml

@@ -28,7 +28,7 @@
     </xpath>
     <!-- Card #3 -->
     <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
     </xpath>
     <!-- Card #3 - Button -->
     <xpath expr="(//a[hasclass('btn')])[3]" position="attributes">

theme_artists/views/snippets/s_features.xml

@@ -13,11 +13,11 @@
     </xpath>
     <!-- Feature #01 - Icon -->
     <xpath expr="//i" position="attributes">
-        <attribute name="class" add="bg-o-color-5" remove="bg-primary" separator=" "/>
+        <attribute name="class" add="bg-o-color-5" remove="bg-o-color-1" separator=" "/>
     </xpath>
     <!-- Feature #03 - Icon -->
     <xpath expr="(//i)[3]" position="attributes">
-        <attribute name="class" add="bg-o-color-5" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-5" remove="bg-o-color-2" separator=" "/>
     </xpath>
 </template>
 

theme_artists/views/snippets/s_features_grid.xml

@@ -17,13 +17,13 @@
         <attribute name="class" add="rounded" remove="rounded-circle" separator=" "/>
     </xpath>
     <xpath expr="(//i)[4]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
     </xpath>
     <xpath expr="(//i)[5]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
     </xpath>
     <xpath expr="(//i)[6]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
     </xpath>
 </template>
 

theme_artists/views/snippets/s_process_steps.xml

@@ -8,10 +8,10 @@
     </xpath>
     <!-- Icons -->
     <xpath expr="//i" position="attributes">
-        <attribute name="class" add="bg-o-color-5" remove="bg-primary" separator=" "/>
+        <attribute name="class" add="bg-o-color-5" remove="bg-o-color-1" separator=" "/>
     </xpath>
     <xpath expr="(//i)[3]" position="attributes">
-        <attribute name="class" add="bg-o-color-5" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-5" remove="bg-o-color-2" separator=" "/>
     </xpath>
     <xpath expr="(//i)[4]" position="attributes">
         <attribute name="class" add="bg-o-color-5" remove="bg-o-color-3" separator=" "/>

theme_artists/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="o_cc4 o_colored_level" remove="o_cc2" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc2" separator=" "/>
     </xpath>
     <!-- Column #1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">

theme_avantgarde/views/customizations.xml

@@ -164,7 +164,7 @@
 <template id="s_call_to_action" inherit_id="website.s_call_to_action" name="Avantgarde s_call_to_action">
 
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc3 o_half_screen_height pt0" remove="pt48" separator=" "/>
+        <attribute name="class" add="o_half_screen_height pt0" remove="pt48" separator=" "/>
     </xpath>
     <xpath expr="//h3" position="replace">
         <h3 style="text-align: right;"><b>Since 1992</b> creating around the world.</h3>
@@ -184,9 +184,6 @@
     <xpath expr="//div[hasclass('col-lg-4')]/p" position="attributes">
         <attribute name="style" add="text-align: left;" remove="text-align: right;" separator=";"/>
     </xpath>
-    <xpath expr="//a[hasclass('btn')]" position="attributes">
-        <attribute name="class" add="btn-lg" separator=" "/>
-    </xpath>
 </template>
 
 <template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action" name="Avantgarde s_call_to_action">

theme_beauty/views/snippets/s_company_team.xml

@@ -4,7 +4,7 @@
 <template id="s_company_team" inherit_id="website.s_company_team">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc4 pt80 pb80" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4 pt80 pb80" remove="pb48 pt48" separator=" "/>
     </xpath>
     <!-- Titles -->
     <xpath expr="(//div[hasclass('col-lg-8')])[1]/h4" position="replace" mode="inner">