NextERP/design-themes
2
0
Fork 0
mirror of https://github.com/odoo/design-themes.git synced 2025-10-07 01:18:52 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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

X-original-commit: 9984745d3d
Part-of: odoo/design-themes#744
This commit is contained in:
Benoit Socias
2023-10-24 13:38:32 +02:00
parent 76e9cbcdb6
commit 1a96421764
26 changed files with 1356 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme_notes/views/new_page_template.xml
+38 -2
View File
@@ -72,6 +72,13 @@
<xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
</template>
<template id="new_page_template_s_quotes_carousel" inherit_id="website.new_page_template_s_quotes_carousel">
<xpath expr="//section" position="attributes">
<!-- o_cc is added by both theme and new page template -->
<attribute name="class" add="o_cc" remove="o_cc o_cc1" separator=" "/>
</xpath>
</template>
<!-- Snippet customization Basic Pages -->
<!-- Needed because it is removed for basic -->
@@ -119,21 +126,28 @@
</xpath>
</template>
<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
<xpath expr="//section" position="attributes">
<attribute name="class" remove="pt48 pb56" separator=" "/>
</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" add="o_cc2" remove="o_cc3" separator=" "/>
<attribute name="class" add="o_cc o_cc2 pt24 pb24" remove="o_cc3 pt0 pb0" separator=" "/>
</xpath>
</template>
<template id="new_page_template_about_full_s_text_block_h1" inherit_id="website.new_page_template_about_full_s_text_block_h1">
<xpath expr="//section" position="attributes">
<attribute name="class" add="pb40 pb40 pt40" remove="o_cc2 pb0" separator=" "/>
<attribute name="class" add="pb40" remove="o_cc2 pb0" separator=" "/>
</xpath>
</template>
<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="class" remove="pt56 pb56" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
</xpath>
</template>
@@ -144,6 +158,13 @@
</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">
<!-- pt0 is defined by both theme and new page template -->
<attribute name="class" add="o_cc pt0" remove="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="replace"/>
</template>
@@ -153,6 +174,7 @@
<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="class" remove="pt56 pb56" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
</xpath>
</template>
@@ -212,11 +234,18 @@
</xpath>
</template>
<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
<xpath expr="//section" position="attributes">
<attribute name="class" remove="pt48 pb56" separator=" "/>
</xpath>
</template>
<!-- Snippet customization Services Pages -->
<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="class" remove="pt56 pb56" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
</xpath>
</template>
@@ -241,11 +270,18 @@
</xpath>
</template>
<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
<xpath expr="//section" position="attributes">
<attribute name="class" remove="pt48 pb56" separator=" "/>
</xpath>
</template>
<!-- Snippet customization Team Pages -->
<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="class" remove="pt56 pb56" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
</xpath>
</template>