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

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
Download Patch File Download Diff File Expand all files Collapse all files
theme_yes/views/new_page_template.xml
+24 -4
View File
@@ -118,6 +118,13 @@
</xpath>
</template>
<template id="new_page_template_about_mini_s_cover" inherit_id="website.new_page_template_about_mini_s_cover">
<xpath expr="//section" position="attributes">
<!-- Defined in both theme and new page template -->
<attribute name="class" add="o_half_screen_height" remove="pt40 pb40 o_half_screen_height" separator=" "/>
</xpath>
</template>
<template id="new_page_template_about_mini_s_text_block_2nd" inherit_id="website.new_page_template_about_mini_s_text_block_2nd">
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc2" separator=" "/>
@@ -144,6 +151,13 @@
</xpath>
</template>
<template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
<xpath expr="//section" position="attributes">
<!-- pb256 is defined by both theme and new page template -->
<attribute name="class" add="pb256" remove="pt208 pb256" separator=" "/>
</xpath>
</template>
<template id="new_page_template_landing_1_s_banner" inherit_id="website.new_page_template_landing_1_s_banner">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
@@ -158,7 +172,7 @@
<template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
<attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
</xpath>
<!-- Shape -->
@@ -182,7 +196,7 @@
<template id="new_page_template_landing_4_s_cover" inherit_id="website.new_page_template_landing_4_s_cover">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
<attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
</xpath>
<!-- Shape -->
@@ -207,7 +221,7 @@
<template id="new_page_template_gallery_s_cover" inherit_id="website.new_page_template_gallery_s_cover">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
<attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
</xpath>
<!-- Shape -->
@@ -229,7 +243,7 @@
<template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
<attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
</xpath>
<!-- Shape -->
@@ -238,6 +252,12 @@
</xpath>
</template>
<template id="new_page_template_pricing_3_s_carousel" inherit_id="website.new_page_template_pricing_3_s_carousel">
<xpath expr="//*[hasclass('carousel-item')][3]" position="attributes">
<attribute name="class" add="pt128 pb128" remove="pt152 pb152" separator=" "/>
</xpath>
</template>
<!-- Snippet customization Team Pages -->
<template id="new_page_template_team_s_company_team" inherit_id="website.new_page_template_team_s_company_team">