NextERP/design-themes
2
0
Fork 0
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_nano/views/new_page_template.xml
+18 -21
View File
@@ -39,6 +39,15 @@
<!-- General customizations -->
<template id="new_page_template_s_parallax" inherit_id="website.new_page_template_s_parallax">
<!-- 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_text_block" inherit_id="website.new_page_template_s_text_block">
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc5 pt40" remove="pt96 o_cc1" separator=" "/>
@@ -56,17 +65,6 @@
<!-- Snippet customization Basic Pages -->
<template id="new_page_template_basic_s_features" inherit_id="website.new_page_template_basic_s_features">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12"}</attribute>
</xpath>
<xpath expr="//*[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Floats_12"/>
</xpath>
</template>
<template id="new_page_template_basic_s_text_block_h1" inherit_id="website.new_page_template_basic_s_text_block_h1">
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc5 pb40" remove="pb96 o_cc1" separator=" "/>
@@ -92,16 +90,6 @@
</xpath>
</template>
<template id="new_page_template_about_s_features" inherit_id="website.new_page_template_about_s_features">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12"}</attribute>
</xpath>
<xpath expr="//*[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Floats_12"/>
</xpath>
</template>
<template id="new_page_template_about_s_text_block_2nd" inherit_id="website.new_page_template_about_s_text_block_2nd">
<xpath expr="//section" position="attributes">
<attribute name="class" remove="pt96" separator=" "/>
@@ -189,6 +177,15 @@
<!-- Snippet customization Landing Pages -->
<template id="new_page_template_landing_s_features" inherit_id="website.new_page_template_landing_s_features">
<!-- 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_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
theme_nano/views/snippets/s_features.xml
+4 -10
View File
@@ -5,6 +5,10 @@
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="pt40 pb48 o_cc o_cc5" remove="pt32 pb32" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12"}</attribute>
</xpath>
<xpath expr="//*[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Floats_12"/>
</xpath>
<!-- Column #01 -->
<xpath expr="//h3" position="replace" mode="inner">
@@ -32,14 +36,4 @@
</xpath>
</template>
<template id="configurator_s_features" inherit_id="website.configurator_s_features">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12"}</attribute>
</xpath>
<xpath expr="//*[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Floats_12"/>
</xpath>
</template>
</odoo>
theme_nano/views/snippets/s_parallax.xml
+5 -11
View File
@@ -5,6 +5,11 @@
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="pt48 pb48" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/10", "flip":["x","y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//*[hasclass('oe_structure')]" position="before">
<div class="o_we_shape o_web_editor_Rainy_10" style="background-image: url('/web_editor/shape/web_editor/Rainy/10.svg?c1=o-color-1&amp;c3=o-color-3&amp;flip=xy'); background-position: 50% 50%;"/>
</xpath>
<!-- Content -->
<xpath expr="//*[hasclass('oe_structure')]" position="inside">
@@ -16,15 +21,4 @@
</xpath>
</template>
<template id="configurator_s_parallax" inherit_id="website.configurator_s_parallax">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/10", "flip":["x","y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//*[hasclass('oe_structure')]" position="before">
<div class="o_we_shape o_web_editor_Rainy_10" style="background-image: url('/web_editor/shape/web_editor/Rainy/10.svg?c1=o-color-1&amp;c3=o-color-3&amp;flip=xy'); background-position: 50% 50%;"/>
</xpath>
</template>
</odoo>