[FIX] theme_*: remove duplicate and conflicting classes from new pages

Given that the duplicate and conflicting classes resolved by the
previous commit did still exist at the time new page templates were
introduced in [1], they could not be avoided for new page templates
snippets.

This commit removes those from the new page templates snippets now that
they have been removed from the base snippets.

[1]: https://github.com/odoo/design-themes/commit/80cbee66f6bb4d897dd7e577f1109c75f6f6ad74

task-3562147

Part-of: odoo/design-themes#731
This commit is contained in:
Benoit Socias
2023-10-24 13:38:32 +02:00
parent f3da06dc68
commit 9984745d3d
26 changed files with 1356 additions and 167 deletions
+38 -15
View File
@@ -33,19 +33,6 @@
</xpath>
</template>
<template id="new_page_template_s_picture_only" inherit_id="website.new_page_template_s_picture_only" primary="True">
<xpath expr="//a" position="replace"/>
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":["y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Wavy_08" style="background-image: url('/web_editor/shape/web_editor/Wavy/08.svg?c2=o-color-3&amp;flip=y'); background-position: 50% 100%;"/>
</xpath>
</template>
<template id="new_page_template_s_product_catalog" inherit_id="website.new_page_template_s_product_catalog">
<!-- Remove shape option -->
<xpath expr="//section" position="attributes">
@@ -90,7 +77,7 @@
<xpath expr="//a" position="replace"/>
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
<attribute name="class" add="o_cc2" remove="o_cc1" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":["y"]}</attribute>
</xpath>
<!-- Shape -->
@@ -117,7 +104,7 @@
<xpath expr="//a" position="replace"/>
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
<attribute name="class" add="o_cc2" remove="o_cc1" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":["y"]}</attribute>
</xpath>
<!-- Shape -->
@@ -132,6 +119,24 @@
</xpath>
</template>
<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" remove="o_cc3" separator=" "/>
</xpath>
</template>
<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
<xpath expr="//section" position="attributes">
<attribute name="class" remove="pt56 pb56" separator=" "/>
</xpath>
</template>
<template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
<xpath expr="//section" position="attributes">
<attribute name="class" remove="o_cc3 pt0" separator=" "/>
</xpath>
</template>
<template id="new_page_template_about_personal_s_text_block_h2" inherit_id="website.new_page_template_about_personal_s_text_block_h2">
<xpath expr="//section" position="attributes">
<attribute name="class" remove="o_cc3" separator=" "/>
@@ -140,6 +145,12 @@
<!-- Snippet customization Landing Pages -->
<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
<xpath expr="//section" position="attributes">
<attribute name="class" remove="pt56 pb56" separator=" "/>
</xpath>
</template>
<template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
@@ -156,6 +167,12 @@
<!-- Snippet customization Services Pages -->
<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
<xpath expr="//section" position="attributes">
<attribute name="class" remove="pt56 pb56" separator=" "/>
</xpath>
</template>
<!-- Snippet customization Pricing Pages -->
<template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
@@ -172,6 +189,12 @@
</xpath>
</template>
<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
<xpath expr="//section" position="attributes">
<attribute name="class" remove="pt56 pb56" separator=" "/>
</xpath>
</template>
<template id="new_page_template_team_1_s_text_block_h1" inherit_id="website.new_page_template_team_1_s_text_block_h1">
<xpath expr="//section" position="attributes">
<attribute name="class" add="pb0" remove="o_cc2 pb40" separator=" "/>