[IMP] theme_*: review s_picture snippet occurrences

The goal of this commit is to fix xpath after the `s_picture` snippet
redesign, and eventually tweak some classes.

task-4047748

closes odoo/design-themes#824

Related: odoo/odoo#172740
Signed-off-by: Arthur Detroux (ard) <ard@odoo.com>
This commit is contained in:
Chrysanthe (chgo)
2024-07-17 16:45:52 +02:00
parent e3fc061cb9
commit 8ff74b77c6
22 changed files with 39 additions and 58 deletions
+1 -2
View File
@@ -4,11 +4,10 @@
<template id="s_picture" inherit_id="website.s_picture">
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
<attribute name="class" add="o_cc5" separator=" "/>
</xpath>
<!-- Image -->
<xpath expr="//img" position="attributes">
<attribute name="class" remove="img-thumbnail" separator=" "/>
<attribute name="style">width: 100%;</attribute>
</xpath>
</template>
+1 -2
View File
@@ -31,7 +31,7 @@
<!-- ======== PICTURE ======== -->
<template id="s_picture" inherit_id="website.s_picture" name="Avantgarde s_cover">
<xpath expr="//section" position="attributes">
<attribute name="class" add="pt144 pb128" remove="pt48 pb24" separator=" "/>
<attribute name="class" add="pt144 pb128" remove="pt64 pb64" separator=" "/>
</xpath>
<xpath expr="//h2" position="attributes">
<attribute name="style" remove="text-align: center;" separator=" "/>
@@ -48,7 +48,6 @@
We combine a wide spectrum of technologies with a good portion of creativity.
</xpath>
<xpath expr="//img" position="attributes">
<attribute name="class" remove="img-thumbnail" separator=" "/>
<attribute name="src">/web_editor/image_shape/website.s_picture_default_image/web_editor/composition/composition_organic_line.svg?c2=o-color-2</attribute>
<attribute name="data-shape">web_editor/composition/composition_organic_line</attribute>
<attribute name="data-original-mimetype">image/jpeg</attribute>
+2 -3
View File
@@ -3,17 +3,16 @@
<template id="s_picture" inherit_id="website.s_picture">
<xpath expr="//section" position="attributes">
<attribute name="class" add="pt72 overflow-hidden o_cc3 bg-o-color-3" remove="pt48 o_cc2" separator=" "/>
<attribute name="class" add="pt72 overflow-hidden o_cc3 bg-o-color-3" remove="pt64" separator=" "/>
</xpath>
<xpath expr="//h2" position="replace" mode="inner">
Our travel agencies
</xpath>
<xpath expr="//img" position="attributes">
<attribute name="class" remove="img-thumbnail" separator=" "/>
<attribute name="style">width: 100%;</attribute>
</xpath>
<xpath expr="//figcaption" position="replace">
<figcaption class="text-400"><em>Odoo Travel New York</em></figcaption>
<figcaption class="figure-caption text-400"><em>Odoo Travel New York</em></figcaption>
</xpath>
</template>
+2 -2
View File
@@ -4,11 +4,11 @@
<template id="s_picture" inherit_id="website.s_picture">
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
<attribute name="class" add="o_cc1" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/06","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Rainy_06" style="background-image: url('/web_editor/shape/web_editor/Rainy/06.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
</xpath>
</template>
+2 -2
View File
@@ -19,7 +19,7 @@
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/04_001"}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Origins_04_001"/>
</xpath>
</template>
@@ -76,7 +76,7 @@
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/04_001"}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Origins_04_001"/>
</xpath>
</template>
+2 -2
View File
@@ -4,7 +4,7 @@
<template id="s_picture" inherit_id="website.s_picture">
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc3 pt64" remove="o_cc2 pt48 pb24" separator=" "/>
<attribute name="class" add="o_cc3" remove="pb64" separator=" "/>
</xpath>
<!-- Size -->
<xpath expr="//div[hasclass('col-lg-12')]" position="attributes">
@@ -30,7 +30,7 @@
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/04_001"}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Origins_04_001"/>
</xpath>
</template>
+1 -1
View File
@@ -4,7 +4,7 @@
<template id="s_picture" inherit_id="website.s_picture">
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
<attribute name="class" add="o_cc5" separator=" "/>
</xpath>
<!-- Title -->
<xpath expr="//h2" position="replace" mode="inner">
+4 -7
View File
@@ -169,16 +169,13 @@
<!-- ==== Picture ===== -->
<template id="s_picture" inherit_id="website.s_picture" name="Cobalt s_picture">
<xpath expr="//section" position="attributes">
<attribute name="class" add="pt72 overflow-hidden" remove="o_cc o_cc2 pt48" separator=" "/>
<attribute name="class" add="pt72 overflow-hidden" remove="pt64" separator=" "/>
</xpath>
<xpath expr="//div[hasclass('container')]" position="attributes">
<attribute name="class" add="container-fluid px-5 px-lg-0" remove="container" separator=" "/>
</xpath>
<xpath expr="//img" position="attributes">
<attribute name="class" remove="img-thumbnail padding-large" separator=" "/>
<xpath expr="//div[hasclass('o_container_small')]" position="attributes">
<attribute name="class" add="container-fluid px-5 px-lg-0" remove="o_container_small" separator=" "/>
</xpath>
<xpath expr="//figcaption" position="replace">
<figcaption class="text-400"><em>Our office in Dhaka</em></figcaption>
<figcaption class="figure-caption text-400"><em>Our office in Dhaka</em></figcaption>
</xpath>
</template>
+1 -3
View File
@@ -4,14 +4,12 @@
<template id="s_picture" inherit_id="website.s_picture">
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="pt80" remove="pt48 o_cc o_cc2" separator=" "/>
<attribute name="class" add="pt80" remove="pt64" separator=" "/>
</xpath>
<!-- Title -->
<xpath expr="//h2" position="replace" mode="inner">
Creating places that enhance the human experience.
</xpath>
<!-- Paragraphs -->
<xpath expr="//p[1]" position="replace" />
<!-- Caption -->
<xpath expr="//figcaption" position="replace" mode="inner">
We always put people and nature at the center of our projects.
+2 -5
View File
@@ -268,10 +268,10 @@
<!-- ======== PICTURE ======== -->
<template id="s_picture" inherit_id="website.s_picture" name="Graphene s_picture">
<xpath expr="//section" position="attributes">
<attribute name="class" add="pb0 pt48" remove="pb24 pt48" separator=" "/>
<attribute name="class" add="pb0 pt48" remove="pb64 pt64" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Zigs/01_001","flip":[]}</attribute>
</xpath>
<xpath expr="//section/div[hasclass('container')]" position="before">
<xpath expr="//section/div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Zigs_01_001"/>
</xpath>
<!-- Content -->
@@ -281,9 +281,6 @@
<xpath expr="//p" position="replace" mode="inner">
Put your people at the heart of your marketing with tools that help you get to know your audience <br/>and see who you should be talking to.
</xpath>
<xpath expr="//img" position="attributes">
<attribute name="class" add="p-0 border-0" remove="padding-large" separator=" " />
</xpath>
</template>
</odoo>
+3 -3
View File
@@ -41,7 +41,7 @@
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/03","flip":["y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Wavy_03" style="background-image: url('/web_editor/shape/web_editor/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
</xpath>
</template>
@@ -66,7 +66,7 @@
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/03","flip":["y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Wavy_03" style="background-image: url('/web_editor/shape/web_editor/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
</xpath>
</template>
@@ -102,7 +102,7 @@
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/03","flip":["y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Wavy_03" style="background-image: url('/web_editor/shape/web_editor/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
</xpath>
</template>
+2 -3
View File
@@ -4,7 +4,7 @@
<template id="s_picture" inherit_id="website.s_picture">
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc3" remove="o_cc2" separator=" "/>
<attribute name="class" add="o_cc3" separator=" "/>
</xpath>
<!-- Title -->
<xpath expr="//h2" position="replace" mode="inner">
@@ -12,7 +12,6 @@
</xpath>
<!-- Image -->
<xpath expr="//img" position="attributes">
<attribute name="class" remove="img-thumbnail" separator=" "/>
<attribute name="style">width: 100%;</attribute>
<attribute name="src">/web_editor/image_shape/website.s_media_list_default_image_1/web_editor/geometric_round/geo_round_blob_medium.svg</attribute>
<attribute name="data-shape">web_editor/geometric_round/geo_round_blob_medium</attribute>
@@ -37,7 +36,7 @@
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/03","flip":["y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Wavy_03" style="background-image: url('/web_editor/shape/web_editor/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
</xpath>
</template>
+3 -3
View File
@@ -19,7 +19,7 @@
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Origins_16" style="background-image: url('/web_editor/shape/web_editor/Origins/16.svg?c3=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
</xpath>
</template>
@@ -43,7 +43,7 @@
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Origins_16" style="background-image: url('/web_editor/shape/web_editor/Origins/16.svg?c3=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
</xpath>
</template>
@@ -90,7 +90,7 @@
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Origins_16" style="background-image: url('/web_editor/shape/web_editor/Origins/16.svg?c3=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
</xpath>
</template>
+1 -1
View File
@@ -4,7 +4,7 @@
<template id="s_picture" inherit_id="website.s_picture">
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_colored_level o_cc4 pt96" remove="o_cc2 pt48" separator=" "/>
<attribute name="class" add="o_colored_level o_cc4 pt96" remove="pt64" separator=" "/>
</xpath>
<!-- Heading -->
@@ -81,7 +81,7 @@
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":["y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Wavy_08" style="background-image: url('/web_editor/shape/web_editor/Wavy/08.svg?c2=o-color-3&amp;flip=y'); background-position: 50% 100%;"/>
</xpath>
</template>
@@ -108,7 +108,7 @@
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":["y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Wavy_08" style="background-image: url('/web_editor/shape/web_editor/Wavy/08.svg?c2=o-color-3&amp;flip=y'); background-position: 50% 100%;"/>
</xpath>
</template>
@@ -4,11 +4,11 @@
<template id="s_picture" inherit_id="website.s_picture">
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" remove="o_cc2" add="o_cc1 oe_img_bg" separator=" "/>
<attribute name="class" add="o_cc1 oe_img_bg" separator=" "/>
<attribute name="style">background-image: url('/web/image/website.s_picture_default_image_bg'); background-position: center;</attribute>
</xpath>
<!-- Filter -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_bg_filter bg-white-75"/>
</xpath>
<!-- Title -->
@@ -26,7 +26,7 @@
They are here to help you grow your business!
</xpath>
<!-- Add a button -->
<xpath expr="//p[2]" position="after">
<xpath expr="//p[1]" position="after">
<p style="text-align: center;">
<a t-att-href="cta_btn_href" class="btn btn-primary rounded-circle btn-lg"><t t-esc="cta_btn_text">Contact Us</t></a>
</p>
@@ -50,7 +50,7 @@
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":["y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Wavy_08" style="background-image: url('/web_editor/shape/web_editor/Wavy/08.svg?c2=o-color-3&amp;flip=y'); background-position: 50% 100%;"/>
</xpath>
</template>
+1 -1
View File
@@ -93,7 +93,7 @@
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Wavy_04" style="background-image: url('/web_editor/shape/web_editor/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
</xpath>
</template>
+1 -2
View File
@@ -286,11 +286,10 @@
<!-- ==== Picture ===== -->
<template id="s_picture" inherit_id="website.s_picture" name="Paptic s_picture">
<xpath expr="//section" position="attributes">
<attribute name="class" add="pt72 o_cc1" remove="o_cc2 pt48" separator=" "/>
<attribute name="class" add="pt72 o_cc1" remove="pt64" separator=" "/>
</xpath>
<xpath expr="//img" position="attributes">
<attribute name="src">/web_editor/shape/theme_paptic/s_picture.svg?c1=o-color-1</attribute>
<attribute name="class" remove="img-thumbnail" separator=" "/>
</xpath>
</template>
@@ -4,7 +4,7 @@
<template id="s_picture" inherit_id="website.s_picture">
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc4" remove="o_cc2" separator=" "/>
<attribute name="class" add="o_cc4" separator=" "/>
</xpath>
<!-- Title -->
<xpath expr="//h2" position="replace" mode="inner">
@@ -2,17 +2,12 @@
<odoo>
<template id="s_picture" inherit_id="website.s_picture">
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" remove="o_cc o_cc2" separator=" "/>
</xpath>
<!-- Title -->
<xpath expr="//h2" position="replace" mode="inner">
Working Together
</xpath>
<!-- Image + Shape -->
<xpath expr="//img" position="attributes">
<attribute name="class" remove="img-thumbnail padding-large" separator=" "/>
<attribute name="src">/web_editor/image_shape/website.s_picture_default_image/web_editor/special/special_filter.svg</attribute>
<attribute name="data-file-name">01.svg</attribute>
<attribute name="data-shape">web_editor/special/special_filter</attribute>
+2 -3
View File
@@ -147,7 +147,7 @@
<template id="s_picture" inherit_id="website.s_picture" name="Vehicle s_picture">
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
<attribute name="class" add="o_cc5" separator=" "/>
</xpath>
<!-- Title -->
<xpath expr="//h2" position="replace">
@@ -159,7 +159,6 @@
</xpath>
<!-- Image + Shape -->
<xpath expr="//img" position="attributes">
<attribute name="class" remove="img-thumbnail padding-large" separator=" "/>
<attribute name="src">/web/image/website.s_picture_default_image</attribute>
<attribute name="data-file-name">01.svg</attribute>
</xpath>
@@ -167,7 +166,7 @@
<span class="text-o-color-3">Our uniquely designed LED headlights are not only gorgeous but powerfully light your way.</span>
</xpath>
<!-- Filter -->
<xpath expr="//div[hasclass('container')]" position="before">
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_bg_filter bg-black-50"/>
</xpath>
</template>
+1 -1
View File
@@ -4,7 +4,7 @@
<template id="s_picture" inherit_id="website.s_picture">
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
<attribute name="class" add="o_cc5" separator=" "/>
</xpath>
<!-- Title -->
<xpath expr="//h2" position="replace" mode="inner">