Skip to content

Commit 7b5b320

Browse files
Brieuc-brdBrieuc-brd
committed
[IMP] theme_anelusia, *: adapt s_color_blocks_2 customizations
*: theme_artists, theme_beauty, theme_bewise, theme_buzzy, theme_clean, theme_cobalt, theme_kea, theme_loftspace, theme_notes, theme_odoo_experts, theme_paptic, theme_treehouse, theme_zap This commit adapts the s_color_blocks_2 customizations since this snippet has been redesigned in PR [1]. task-3665302 Part of task-3619705 [1]: odoo/odoo#173461 closes #834 Related: odoo/odoo#173461 Signed-off-by: Soukéina Bojabza (sobo) <[email protected]>
1 parent a945545 commit 7b5b320

File tree

14 files changed

+29
-56
lines changed

14 files changed

+29
-56
lines changed

‎theme_anelusia/views/snippets/s_color_blocks_2.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
55
<!-- Column #1 -->
66
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
7-
<attribute name="class" add="col-lg-4" remove="col-lg-6" separator=" "/>
7+
<attribute name="class" add="col-lg-4 o_cc3 text-center" remove="col-lg-6 o_cc4" separator=" "/>
88
</xpath>
99
<!-- Column #1 - Icon -->
10-
<xpath expr="//i" position="attributes">
11-
<attribute name="class" add="fa-venus" remove="fa-shield" separator=" "/>
10+
<xpath expr="//h2" position="before">
11+
<i class="fa fa-5x m-3 fa-venus"/>
1212
</xpath>
1313
<!-- Column #1 - Title -->
1414
<xpath expr="//h2" position="replace" mode="inner">
@@ -25,11 +25,11 @@
2525

2626
<!-- Column #2 -->
2727
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
28-
<attribute name="class" add="col-lg-4 o_cc4" remove="col-lg-6 o_cc5" separator=" "/>
28+
<attribute name="class" add="o_cc4 col-lg-4 text-center" remove="o_cc5 col-lg-6" separator=" "/>
2929
</xpath>
3030
<!-- Column #2 - Icon -->
31-
<xpath expr="(//i)[2]" position="attributes">
32-
<attribute name="class" add="fa-mars" remove="fa-cube" separator=" "/>
31+
<xpath expr="(//h2)[2]" position="before">
32+
<i class="fa fa-5x m-3 fa-mars"/>
3333
</xpath>
3434
<!-- Column #2 - Title -->
3535
<xpath expr="(//h2)[2]" position="replace" mode="inner">
@@ -48,7 +48,7 @@
4848
<xpath expr="(//div[hasclass('col-lg-4')])[2]" position="after">
4949
<div class="col-lg-4 o_cc o_cc5 text-center">
5050
<i class="fa fa-venus-mars fa-5x m-3"/>
51-
<h2>Fancy for them</h2>
51+
<h2 class="h3-fs">Fancy for them</h2>
5252
<p>Are you looking for sustainable clothing for men or women? Discover our exclusive fashion brand for both of you.</p>
5353
<a href="#" class="btn btn-primary btn-lg">More Details</a>
5454
</div>

‎theme_artists/views/snippets/s_color_blocks_2.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
55
<!-- Left column -->
66
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
7-
<attribute name="class" add="o_cc4 pt208 pb208" remove="o_cc3" separator=" "/>
7+
<attribute name="class" add="pt208 pb208 text-center" separator=" "/>
88
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/27","flip":["x","y"]}</attribute>
99
</xpath>
1010
<!-- Left column - Shape -->
11-
<xpath expr="//div[hasclass('col-lg-6')]//i" position="before">
11+
<xpath expr="//div[hasclass('col-lg-6')]//h2" position="before">
1212
<div class="o_we_shape o_web_editor_Wavy_27 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Wavy/27.svg?c1=o-color-5&amp;c2=o-color-5&amp;flip=xy'); background-position: 50% 50%;"/>
1313
</xpath>
1414
<!-- Left column - Button -->
@@ -17,11 +17,11 @@
1717
</xpath>
1818
<!-- Right column -->
1919
<xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
20-
<attribute name="class" add="pt208 pb208" separator=" "/>
20+
<attribute name="class" add="pt208 pb208 text-center" separator=" "/>
2121
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/27","flip":[]}</attribute>
2222
</xpath>
2323
<!-- Right column - Shape -->
24-
<xpath expr="//div[hasclass('col-lg-6')][2]//i" position="before">
24+
<xpath expr="//div[hasclass('col-lg-6')][2]//h2" position="before">
2525
<div class="o_we_shape o_web_editor_Wavy_27"/>
2626
</xpath>
2727
<!-- Right column - Button -->

‎theme_beauty/views/snippets/s_color_blocks_2.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_color_blocks_2" inherit_id="website.s_color_blocks_2">
5-
<!-- Column #1 -->
6-
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
7-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
8-
</xpath>
95
<!-- Column #2 -->
106
<xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
117
<attribute name="class" add="o_cc1" remove="o_cc5" separator=" "/>

‎theme_bewise/views/customizations.xml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -235,17 +235,13 @@
235235
<template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2" name="Be Wise s_color_blocks_2">
236236
<!-- Left column -->
237237
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
238-
<attribute name="class" add="oe_img_bg o_bg_img_center o_cc5" remove="o_cc3" separator=" "/>
238+
<attribute name="class" add="oe_img_bg o_bg_img_center o_cc5" remove="o_cc4" separator=" "/>
239239
<attribute name="style">background-image: url('/web/image/website.s_media_list_default_image_1');</attribute>
240240
</xpath>
241241
<!-- Left column - Filter -->
242-
<xpath expr="//div[hasclass('col-lg-6')]//i" position="before">
242+
<xpath expr="//div[hasclass('col-lg-6')]//h2" position="before">
243243
<div class="o_we_bg_filter bg-black-50"/>
244244
</xpath>
245-
<!-- Left column - Icon -->
246-
<xpath expr="//div[hasclass('col-lg-6')]//i" position="attributes">
247-
<attribute name="class" add="fa-3x fa-book" remove="fa-5x fa-shield" separator=" "/>
248-
</xpath>
249245
<!-- Left column - Title -->
250246
<xpath expr="//div[hasclass('col-lg-6')]//h2" position="replace" mode="inner">
251247
Programmes
@@ -267,13 +263,9 @@
267263
<attribute name="style">background-image: url('/web/image/website.s_media_list_default_image_2');</attribute>
268264
</xpath>
269265
<!-- Right column - Filter -->
270-
<xpath expr="//div[hasclass('col-lg-6')][2]//i" position="before">
266+
<xpath expr="//div[hasclass('col-lg-6')][2]//h2" position="before">
271267
<div class="o_we_bg_filter bg-black-50"/>
272268
</xpath>
273-
<!-- Right column - Icon -->
274-
<xpath expr="//div[hasclass('col-lg-6')][2]//i" position="attributes">
275-
<attribute name="class" add="fa-3x fa-institution" remove="fa-5x fa-cube" separator=" "/>
276-
</xpath>
277269
<!-- Right column - Title -->
278270
<xpath expr="//div[hasclass('col-lg-6')][2]//h2" position="replace" mode="inner">
279271
The campus

‎theme_buzzy/views/snippets/s_color_blocks_2.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@
44
<template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
55
<!-- Left block -->
66
<xpath expr="//div[hasclass('row')]//div" position="attributes">
7-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
87
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["y","x"]}</attribute>
98
</xpath>
109
<!-- Left block - Shape -->
11-
<xpath expr="//div[hasclass('row')]//div//i" position="before">
10+
<xpath expr="//div[hasclass('row')]//div//h2" position="before">
1211
<div class="o_we_shape o_web_editor_Wavy_11" style="background-image: url('/web_editor/shape/web_editor/Wavy/11.svg?c1=o-color-5&amp;c4=o-color-5&amp;flip=xy'); background-position: 50% 0%;"/>
1312
</xpath>
1413
<!-- Right block -->
1514
<xpath expr="//div[hasclass('row')]//div[2]" position="attributes">
1615
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":[]}</attribute>
1716
</xpath>
1817
<!-- Right block - Shape -->
19-
<xpath expr="//div[hasclass('row')]//div[2]//i" position="before">
18+
<xpath expr="//div[hasclass('row')]//div[2]//h2" position="before">
2019
<div class="o_we_shape o_web_editor_Wavy_11 o_second_extra_shape_mapping"/>
2120
</xpath>
2221
</template>

‎theme_clean/views/snippets/s_color_blocks_2.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
<attribute name="class" add="oe_img_bg" separator=" "/>
88
<attribute name="style">background-image: url('/web/image/website.s_color_blocks_2_default_image_1');</attribute>
99
</xpath>
10-
<xpath expr="//i" position="before">
10+
<xpath expr="//h2" position="before">
1111
<div class="o_we_bg_filter bg-black-50"/>
1212
</xpath>
1313
<!-- Column #2 -->
1414
<xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
1515
<attribute name="class" add="oe_img_bg" separator=" "/>
1616
<attribute name="style">background-image: url('/web/image/website.s_color_blocks_2_default_image_2');</attribute>
1717
</xpath>
18-
<xpath expr="(//i)[2]" position="before">
18+
<xpath expr="(//h2)[2]" position="before">
1919
<div class="o_we_bg_filter bg-black-50"/>
2020
</xpath>
2121
</template>

‎theme_cobalt/views/customizations.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,8 @@
206206
<template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2" name="Cobalt s_color_blocks_2">
207207
<!-- Left column -->
208208
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
209-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
210209
<attribute name="style" add="background-image: linear-gradient(135deg, var(--o-color-2) 0%, var(--o-color-1) 100%);" separator=";"/>
211210
</xpath>
212-
<!-- Left column - Icon -->
213-
<xpath expr="//div[hasclass('col-lg-6')]//i" position="replace"/>
214211
<!-- Left column - Text -->
215212
<xpath expr="//div[hasclass('col-lg-6')]//p" position="replace"/>
216213
<!-- Left column - Title -->
@@ -227,8 +224,6 @@
227224
<attribute name="class" add="o_cc3" remove="o_cc5" separator=" "/>
228225
<attribute name="style" add="background-image: linear-gradient(315deg, var(--o-color-2) 0%, var(--o-color-1) 100%);" separator=";"/>
229226
</xpath>
230-
<!-- Right column - Filter -->
231-
<xpath expr="//div[hasclass('col-lg-6')][2]//i" position="replace"/>
232227
<!-- Right column - Title -->
233228
<xpath expr="//div[hasclass('col-lg-6')][2]//h2" position="replace" mode="inner">
234229
Are you an established brand looking for ongoing creative services?

‎theme_kea/views/snippets/s_color_blocks_2.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,14 @@
1010
<xpath expr="//h2" position="before">
1111
<div class="o_we_bg_filter bg-black-50"></div>
1212
</xpath>
13-
<!-- Box #1 - Icon -->
14-
<xpath expr="//div[hasclass('col-lg-6')]//i" position="replace" />
1513
<!-- Box #1 - Title -->
1614
<xpath expr="//div[hasclass('col-lg-6')]//h2" position="replace" mode="inner">
1715
Multiplayer
1816
</xpath>
1917
<!-- Box #1 - Text -->
2018
<xpath expr="//div[hasclass('col-lg-6')]//p" position="replace" mode="inner">
2119
Conquer leaderboards, crush workouts, create with friends and more. Get lost in a growing library of VR classics and all-new experiences.
22-
</xpath>
20+
</xpath>
2321
<!-- Box #2 -->
2422
<xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
2523
<attribute name="class" add="oe_img_bg o_bg_img_center pt256 pb256" remove="" separator=" " />
@@ -28,8 +26,6 @@
2826
<xpath expr="(//h2)[2]" position="before">
2927
<div class="o_we_bg_filter bg-black-50"></div>
3028
</xpath>
31-
<!-- Box #2 - Icon -->
32-
<xpath expr="//div[hasclass('col-lg-6')][2]//i" position="replace" />
3329
<!-- Box #2 - Title -->
3430
<xpath expr="//div[hasclass('col-lg-6')][2]//h2" position="replace" mode="inner">
3531
Freedom

‎theme_loftspace/views/snippets/s_color_blocks_2.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
<template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
55
<!-- Left column -->
66
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
7-
<attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
7+
<attribute name="class" add="o_cc2" remove="o_cc4" separator=" "/>
88
<attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/04_001','flip':[]}</attribute>
99
</xpath>
10-
<xpath expr="//i" position="before">
10+
<xpath expr="//h2" position="before">
1111
<div class="o_we_shape o_web_editor_Airy_04_001"/>
1212
</xpath>
1313
<!-- Right column -->
1414
<xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
1515
<attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
1616
<attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/04_001','flip':['x']}</attribute>
1717
</xpath>
18-
<xpath expr="(//i)[2]" position="before">
18+
<xpath expr="(//h2)[2]" position="before">
1919
<div class="o_we_shape o_web_editor_Airy_04_001 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Airy/04_001.svg?c1=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
2020
</xpath>
2121
</template>

‎theme_notes/views/snippets/s_color_blocks_2.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</xpath>
99
<!-- Column #1 -->
1010
<xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
11-
<attribute name="class" remove="o_cc o_cc3" separator=" "/>
11+
<attribute name="class" remove="o_cc o_cc4" separator=" "/>
1212
</xpath>
1313
<!-- Column #2 -->
1414
<xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">

0 commit comments

Comments
 (0)