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_loftspace/views/new_page_template.xml
+82 -102
View File
@@ -55,19 +55,35 @@
</xpath>
</template>
<template id="new_page_template_s_numbers" inherit_id="website.new_page_template_s_numbers">
<!-- Shape option -->
<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">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/03_001","flip":["y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_03_001" style="background-image: url('/web_editor/shape/web_editor/Airy/03_001.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 100%;"/>
<attribute name="data-oe-shape-data"/>
</xpath>
<!-- Remove shape -->
<xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
</template>
<!-- Snippet customization Basic Pages -->
<template id="new_page_template_basic_s_image_text" inherit_id="website.new_page_template_basic_s_image_text">
<!-- 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_basic_s_text_image" inherit_id="website.new_page_template_basic_s_text_image">
<!-- 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>
<!-- Snippet customization About Pages -->
<template id="new_page_template_about_s_banner" inherit_id="website.new_page_template_about_s_banner">
@@ -88,32 +104,19 @@
</xpath>
</template>
<template id="new_page_template_about_s_image_text" inherit_id="website.new_page_template_about_s_image_text">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_10" style="background-image: url('/web_editor/shape/web_editor/Airy/10.svg?c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
</xpath>
</template>
<template id="new_page_template_about_full_1_s_text_block_h1" inherit_id="website.new_page_template_about_full_1_s_text_block_h1">
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc2" 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 -->
<template id="new_page_template_about_map_s_text_image" inherit_id="website.new_page_template_about_map_s_text_image">
<!-- Remove shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_10"/>
<attribute name="data-oe-shape-data"/>
</xpath>
<!-- Remove shape -->
<xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
</template>
<template id="new_page_template_about_personal_s_text_block_h2" inherit_id="website.new_page_template_about_personal_s_text_block_h2">
@@ -124,17 +127,6 @@
<!-- Snippet customization Landing Pages -->
<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="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_10"/>
</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">
@@ -173,41 +165,35 @@
</xpath>
</template>
<template id="new_page_template_gallery_s_image_text" inherit_id="website.new_page_template_gallery_s_image_text">
<!-- 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_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
<!-- 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_gallery_s_text_image" inherit_id="website.new_page_template_gallery_s_text_image">
<!-- 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>
<!-- Snippet customization Services Pages -->
<template id="new_page_template_services_s_image_text" inherit_id="website.new_page_template_services_s_image_text">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_10" style="background-image: url('/web_editor/shape/web_editor/Airy/10.svg?c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
</xpath>
</template>
<template id="new_page_template_services_s_image_text_2nd" inherit_id="website.new_page_template_services_s_image_text_2nd">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_10" style="background-image: url('/web_editor/shape/web_editor/Airy/10.svg?c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
</xpath>
</template>
<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="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_10"/>
</xpath>
</template>
<!-- Snippet customization Pricing Pages -->
<template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
@@ -217,41 +203,35 @@
</xpath>
</template>
<template id="new_page_template_pricing_s_image_text" inherit_id="website.new_page_template_pricing_s_image_text">
<!-- 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_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
<!-- 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_pricing_s_text_image" inherit_id="website.new_page_template_pricing_s_text_image">
<!-- 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>
<!-- Snippet customization Team Pages -->
<template id="new_page_template_team_s_image_text" inherit_id="website.new_page_template_team_s_image_text">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_10" style="background-image: url('/web_editor/shape/web_editor/Airy/10.svg?c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
</xpath>
</template>
<template id="new_page_template_team_s_image_text_2nd" inherit_id="website.new_page_template_team_s_image_text_2nd">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_10" style="background-image: url('/web_editor/shape/web_editor/Airy/10.svg?c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
</xpath>
</template>
<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="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_10"/>
</xpath>
</template>
<template id="new_page_template_team_s_text_block_h1" inherit_id="website.new_page_template_team_s_text_block_h1">
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc2" separator=" "/>
theme_loftspace/views/snippets/s_image_text.xml
+5 -11
View File
@@ -5,6 +5,11 @@
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="pt64 pb64" remove="pt32 pb32" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_10" style="background-image: url('/web_editor/shape/web_editor/Airy/10.svg?c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
</xpath>
<!-- Img wrapper -->
<xpath expr="//div[hasclass('row')]//div" position="attributes">
@@ -16,15 +21,4 @@
</xpath>
</template>
<template id="configurator_s_image_text" inherit_id="website.configurator_s_image_text">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_10" style="background-image: url('/web_editor/shape/web_editor/Airy/10.svg?c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
</xpath>
</template>
</odoo>
theme_loftspace/views/snippets/s_numbers.xml
-6
View File
@@ -5,12 +5,6 @@
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="pt80 pb192 o_cc5" remove="pt24 pb24 o_cc2" separator=" "/>
</xpath>
</template>
<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/03_001","flip":["y"]}</attribute>
</xpath>
<!-- Shape -->
theme_loftspace/views/snippets/s_product_catalog.xml
+2 -11
View File
@@ -5,20 +5,11 @@
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc o_cc5 pt112 pb112" remove="pt48 pb32" separator=" "/>
</xpath>
<!-- Filter -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_bg_filter bg-black-50"/>
</xpath>
</template>
<template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/09","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<!-- Filter & shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_bg_filter bg-black-50"/>
<div class="o_we_shape o_web_editor_Floats_09"/>
</xpath>
</template>
theme_loftspace/views/snippets/s_text_image.xml
+5 -11
View File
@@ -5,6 +5,11 @@
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="pt64 pb64 o_cc o_cc5" remove="pt32 pb32" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_10"/>
</xpath>
<!-- Img wrapper -->
<xpath expr="//div[hasclass('row')]//div[2]" position="attributes">
@@ -12,15 +17,4 @@
</xpath>
</template>
<template id="configurator_s_text_image" inherit_id="website.configurator_s_text_image">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_10"/>
</xpath>
</template>
</odoo>