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

[IMP] theme_*: restore base snippet shapes that do not connect blocks

Browse Source 
In [1] all shapes were moved from the base snippet to the specific
configurator snippet. This was a bit overkill.

This commit reverts this partially so that only shapes that connect
with each other are specific to the configurator, but "intra-block"
shapes are restored onto the base snippet.
The "New page from template" snippets are adapted accordingly in order
to produce the same output as before this commit.

Restored shapes are: (label (image))
- Origins: 12 (18)
- Blob: 11 (11)
- Airy: 03 (03_001), 04 (04_001), 07 (07), 10 (10), 11 (11), 14 (14)
- Zigs: 01 (01_001), 02 (02_001)
- Wavy: 04 (10), 15 (11)
- Blocks: 02 (01_001)
- Rainy: 03 (06), 05 (10), 09 (08_001), 10 (09_001)
- Floats: all

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

task-3555325

closes odoo/design-themes#726

Related: odoo/odoo#138748
Signed-off-by: Romain Derie (rde) <rde@odoo.com>
This commit is contained in:
Benoit Socias
2023-10-17 14:52:06 +02:00
parent 1aa6700c98
commit 796da67b29
74 changed files with 689 additions and 1426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme_kea/views/new_page_template.xml
+9 -46
View File
@@ -26,6 +26,15 @@
</xpath>
</template>
<template id="new_page_template_s_media_list" inherit_id="website.new_page_template_s_media_list">
<!-- Remove shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data"/>
</xpath>
<!-- Remove shape -->
<xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
</template>
<template id="new_page_template_s_picture_only" inherit_id="website.new_page_template_s_picture_only">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
@@ -71,14 +80,8 @@
<!-- Snippet customization About Pages -->
<template id="new_page_template_about_s_cover" inherit_id="website.new_page_template_about_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="data-oe-shape-data">{"shape":"web_editor/Floats/02","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
<div class="o_we_shape o_web_editor_Floats_02"/>
</xpath>
</template>
@@ -163,26 +166,9 @@
</xpath>
</template>
<template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/02","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
<div class="o_we_shape o_web_editor_Floats_02"/>
</xpath>
</template>
<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="data-oe-shape-data">{"shape":"web_editor/Floats/02","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
<div class="o_we_shape o_web_editor_Floats_02"/>
</xpath>
</template>
@@ -198,28 +184,11 @@
</xpath>
</template>
<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="data-oe-shape-data">{"shape":"web_editor/Floats/02","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
<div class="o_we_shape o_web_editor_Floats_02"/>
</xpath>
</template>
<!-- Snippet customization Gallery Pages -->
<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="data-oe-shape-data">{"shape":"web_editor/Floats/02","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
<div class="o_we_shape o_web_editor_Floats_02"/>
</xpath>
</template>
@@ -228,14 +197,8 @@
<!-- Snippet customization Pricing Pages -->
<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="data-oe-shape-data">{"shape":"web_editor/Floats/02","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
<div class="o_we_shape o_web_editor_Floats_02"/>
</xpath>
</template>
theme_kea/views/snippets/s_cover.xml
+5 -11
View File
@@ -6,8 +6,13 @@
<xpath expr="//section" position="attributes">
<attribute name="class" add="oe_img_bg o_full_screen_height" remove="parallax s_parallax_is_fixed" separator=" "/>
<attribute name="data-scroll-background-ratio">0</attribute>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/02","flip":[]}</attribute>
<attribute name="style">background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 0;</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
<div class="o_we_shape o_web_editor_Floats_02"/>
</xpath>
<!-- Disable Parallax -->
<xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
<!-- Title -->
@@ -24,15 +29,4 @@
</xpath>
</template>
<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/02","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
<div class="o_we_shape o_web_editor_Floats_02"/>
</xpath>
</template>
</odoo>
theme_kea/views/snippets/s_media_list.xml
+5 -11
View File
@@ -5,6 +5,11 @@
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc2 pt64 pb64" remove="o_cc1 pt32 pb32" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/01","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Floats_01"/>
</xpath>
<!-- Row 1 -->
<xpath expr="(//div[hasclass('row')])[2]" position="attributes">
@@ -80,15 +85,4 @@
</xpath>
</template>
<template id="configurator_s_media_list" inherit_id="website.configurator_s_media_list">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/01","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Floats_01"/>
</xpath>
</template>
</odoo>