Skip to content

Commit 24b689a

Browse files
chgo-odoochgo-odoo
committed
[IMP] theme_*: adapt s_text_image templates
This commit aims to review all the occurrences of the `s_text_image` snippet across the themes in order to fix broken selectors. task-3665301 Part-of: #830 Related: odoo/odoo#173311 Signed-off-by: Robin Lejeune (role) <[email protected]>
1 parent 0a64c01 commit 24b689a

File tree

25 files changed

+50
-79
lines changed

25 files changed

+50
-79
lines changed

‎theme_artists/views/snippets/s_text_image.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<template id="s_text_image" inherit_id="website.s_text_image">
55
<!-- Section -->
66
<xpath expr="//section" position="attributes">
7-
<attribute name="class" add="o_cc o_cc5 pb128" remove="pb32" separator=" "/>
7+
<attribute name="class" add="o_cc o_cc5 pb128" remove="pb80" separator=" "/>
88
</xpath>
99
<!-- Title -->
1010
<xpath expr="//h2" position="replace" mode="inner">
@@ -18,8 +18,8 @@
1818
Welcome to my online home. I invite you to come in, learn more about me and my work, and stop to embrace the slow pleasure of art and beauty.
1919
</xpath>
2020
<!-- Picture -->
21-
<xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
22-
<attribute name="class" add="col-lg-5 offset-lg-1" remove="col-lg-6" separator=" "/>
21+
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
22+
<attribute name="class" add="col-lg-5" remove="col-lg-6" separator=" "/>
2323
</xpath>
2424
<xpath expr="//img" position="attributes">
2525
<attribute name="src">/web_editor/image_shape/website.s_text_image_default_image/web_editor/geometric/geo_square_2.svg</attribute>

‎theme_avantgarde/views/customizations.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@
112112
<xpath expr="//section" position="attributes">
113113
<attribute name="class" add="o_cc o_cc3 o_full_screen_height" separator=" "/>
114114
</xpath>
115-
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
116-
<attribute name="class" add="col-lg-4 offset-lg-1" remove="col-lg-6" separator=" "/>
115+
<xpath expr="//div[hasclass('col-lg-5')]" position="attributes">
116+
<attribute name="class" add="col-lg-4 offset-lg-1" remove="col-lg-5" separator=" "/>
117117
</xpath>
118118
<xpath expr="//h2" position="replace" mode="inner">
119119
<span class="text-break" style="font-size: 62px; font-weight: bolder;">Our R&amp;D Approach</span>
@@ -133,11 +133,7 @@
133133
<xpath expr="//a[hasclass('btn')]" position="attributes">
134134
<attribute name="class" add="btn-lg" separator=" "/>
135135
</xpath>
136-
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
137-
<attribute name="class" add="offset-lg-1" separator=" "/>
138-
</xpath>
139136
<xpath expr="//img" position="attributes">
140-
<attribute name="class" remove="img-thumbnail" separator=" "/>
141137
<attribute name="src">/web_editor/image_shape/website.s_text_image_default_image/web_editor/composition/composition_triangle_line.svg?c1=o-color-1</attribute>
142138
<attribute name="data-shape">web_editor/composition/composition_triangle_line</attribute>
143139
<attribute name="data-original-mimetype">image/jpeg</attribute>

‎theme_aviato/views/snippets/s_text_image.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<xpath expr="//p[3]" position="replace"/>
2121
<!-- layout -->
2222
<xpath expr="//div[hasclass('row')]/div[1]" position="attributes">
23-
<attribute name="class" add="col-lg-4 offset-lg-2" remove="col-lg-6" separator=" "/>
23+
<attribute name="class" add="col-lg-4 offset-lg-2" remove="col-lg-5" separator=" "/>
2424
</xpath>
2525
<!-- Image -->
2626
<xpath expr="//img" position="attributes">

‎theme_bewise/views/customizations.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
<xpath expr="//h2" position="replace" mode="inner">
3838
Driven by Excellence
3939
</xpath>
40-
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
41-
<attribute name="class" add="col-lg-4 offset-lg-1" remove="col-lg-6" separator=" "/>
40+
<xpath expr="//div[hasclass('col-lg-5')]" position="attributes">
41+
<attribute name="class" add="col-lg-4 offset-lg-1" remove="col-lg-5" separator=" "/>
4242
</xpath>
4343
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
44-
<attribute name="class" add="col-lg-5 offset-lg-1" remove="col-lg-6" separator=" "/>
44+
<attribute name="class" add="col-lg-5" remove="col-lg-6" separator=" "/>
4545
</xpath>
4646
<xpath expr="//p" position="replace" mode="inner">
4747
<br/>

‎theme_bistro/views/snippets/s_text_image.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
<odoo>
33

44
<template id="s_text_image" inherit_id="website.s_text_image">
5-
<!-- Section -->
6-
<xpath expr="//section" position="attributes">
7-
<attribute name="class" add="pt80 pb80" remove="o_cc o_cc2 pt32 pb32" separator=" "/>
8-
</xpath>
95
<!-- Image -->
106
<xpath expr="//img" position="attributes">
117
<attribute name="src">/web_editor/image_shape/website.s_text_image_default_image/web_editor/geometric_round/geo_round_square_2.svg</attribute>

‎theme_bookstore/views/snippets/s_text_image.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
<template id="s_text_image" inherit_id="website.s_text_image">
55
<!-- Section -->
66
<xpath expr="//section" position="attributes">
7-
<attribute name="class" add="o_cc o_cc5 pt112 pb112" remove="pt32 pb32" separator=" "/>
8-
</xpath>
9-
<!-- Wrapper -->
10-
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
11-
<attribute name="class" add="col-lg-5" remove="col-lg-6" separator=" "/>
7+
<attribute name="class" add="o_cc o_cc5 pt112 pb112" remove="pt80 pb80" separator=" "/>
128
</xpath>
139
<!-- Title -->
1410
<xpath expr="//h2" position="replace" mode="inner">
@@ -24,7 +20,7 @@
2420
</xpath>
2521
<!-- Img Wrapper -->
2622
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
27-
<attribute name="class" add="col-lg-5 offset-lg-2" remove="col-lg-6" separator=" "/>
23+
<attribute name="class" add="col-lg-5 offset-lg-2" remove="col-lg-6 offset-lg-1" separator=" "/>
2824
</xpath>
2925
</template>
3026

‎theme_buzzy/views/snippets/s_text_image.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<template id="s_text_image" inherit_id="website.s_text_image">
55
<!-- Section -->
66
<xpath expr="//section" position="attributes">
7-
<attribute name="class" add="o_cc o_cc2 pt72 pb72" remove="pt32 pb32" separator=" "/>
7+
<attribute name="class" add="o_cc o_cc2 pt72 pb72" remove="pt80 pb80" separator=" "/>
88
</xpath>
99
<!-- Title -->
1010
<xpath expr="//h2" position="replace" mode="inner">

‎theme_clean/views/snippets/s_text_image.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<template id="s_text_image" inherit_id="website.s_text_image">
55
<!-- Section -->
66
<xpath expr="//section" position="attributes">
7-
<attribute name="class" add="o_cc o_cc2 pt72 pb72" remove="pt32 pb32" separator=" "/>
7+
<attribute name="class" add="o_cc o_cc2 pt72 pb72" remove="pt80 pb80" separator=" "/>
88
</xpath>
99
<!-- Title & Paragraphs -->
1010
<xpath expr="//h2" position="replace" mode="inner">

‎theme_cobalt/views/customizations.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<template id="s_text_image" inherit_id="website.s_text_image" name="Cobalt s_text_image">
8585
<!-- Section -->
8686
<xpath expr="//section" position="attributes">
87-
<attribute name="class" add="pt80 pb88" remove="pt32 pb32" separator=" "/>
87+
<attribute name="class" add="pb88" remove="pb80" separator=" "/>
8888
</xpath>
8989
<!-- Content -->
9090
<xpath expr="//h2" position="replace" mode="inner">
@@ -102,9 +102,6 @@
102102
<p>We have collected solid experience in building native and cross-platform mobile applications and websites. Check our portfolio from clients around the world.</p>
103103
<br/>
104104
</xpath>
105-
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
106-
<attribute name="class" add="col-lg-5" remove="col-lg-6" separator=" "/>
107-
</xpath>
108105
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
109106
<attribute name="class" add="col-lg-7" remove="col-lg-6" separator=" "/>
110107
</xpath>

‎theme_enark/views/snippets/s_text_image.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<template id="s_text_image" inherit_id="website.s_text_image">
55
<!-- Section -->
66
<xpath expr="//section" position="attributes">
7-
<attribute name="class" add="o_cc o_cc5 pb96 pt96" remove="pt32 pb32" separator=" "/>
7+
<attribute name="class" add="o_cc o_cc5 pb96 pt96" remove="pt80 pb80" separator=" "/>
88
</xpath>
99
<!-- Wrapper -->
10-
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
10+
<xpath expr="//div[hasclass('col-lg-5')]" position="attributes">
1111
<attribute name="class" add="border" separator=" "/>
1212
<attribute name="style" add="padding:24px; border-width: 1px !important; border-color: rgb(70, 77, 83) !important; border-radius: 4px !important;"/>
1313
</xpath>
14-
<xpath expr="(//div[hasclass('col-lg-6')])[2]" position="attributes">
15-
<attribute name="class" add="col-lg-5 offset-lg-1" remove="col-lg-6" separator=" "/>
14+
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
15+
<attribute name="class" add="col-lg-5" remove="col-lg-6" separator=" "/>
1616
</xpath>
1717
<!-- Title -->
1818
<xpath expr="//h2" position="replace" mode="inner">

0 commit comments

Comments
 (0)