Skip to content

Commit a5b4acd

Browse files
stefanoriganostefanorigano
committed
[IMP] theme_*: s_comparison redesign adaptations
*: theme_anelusia, theme_artists, theme_beauty, theme_bewise, theme_bookstore, theme_buzzy, theme_clean, theme_graphene, theme_loftspace, theme_odoo_experts, theme_paptic, theme_treehouse task-3665304 part of task-3619705 closes #842 Related: odoo/odoo#174299 Signed-off-by: Benoit Socias (bso) <[email protected]>
1 parent 816ce83 commit a5b4acd

File tree

13 files changed

+19
-117
lines changed

13 files changed

+19
-117
lines changed

‎theme_anelusia/views/snippets/s_comparisons.xml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,6 @@
66
<xpath expr="//section" position="attributes">
77
<attribute name="class" add="o_cc o_cc4" separator=" "/>
88
</xpath>
9-
<!-- Card #1 -->
10-
<xpath expr="//div[hasclass('card')]" position="attributes">
11-
<attribute name="class" add="bg-black-15" remove="bg-200" separator=" "/>
12-
</xpath>
13-
<xpath expr="//a[hasclass('btn')]" position="attributes">
14-
<attribute name="class" add="btn-secondary" remove="btn-primary" separator=" "/>
15-
</xpath>
16-
<!-- Card #2 -->
17-
<xpath expr="(//div[hasclass('card')])[2]" position="attributes">
18-
<attribute name="class" add="bg-black-15" remove="bg-o-color-5" separator=" "/>
19-
</xpath>
20-
<xpath expr="(//a[hasclass('btn')])[2]" position="attributes">
21-
<attribute name="class" add="btn-secondary" remove="btn-primary" separator=" "/>
22-
</xpath>
23-
<!-- Card #3 -->
24-
<xpath expr="(//div[hasclass('card')])[3]" position="attributes">
25-
<attribute name="class" add="bg-black-15" remove="bg-o-color-2" separator=" "/>
26-
</xpath>
27-
<xpath expr="(//a[hasclass('btn')])[3]" position="attributes">
28-
<attribute name="class" add="btn-secondary" remove="btn-primary" separator=" "/>
29-
</xpath>
309
</template>
3110

3211
</odoo>

‎theme_artists/views/new_page_template.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
</template>
4444

4545
<template id="new_page_template_s_comparisons" inherit_id="website.new_page_template_s_comparisons">
46-
<xpath expr="(//div[hasclass('card')])[3]" position="attributes">
47-
<attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
46+
<xpath expr="(//a[hasclass('btn')])[3]" position="attributes">
47+
<attribute name="class" add="btn-success" remove="btn-outline-primary" separator=" "/>
4848
</xpath>
4949
</template>
5050

‎theme_artists/views/snippets/s_comparisons.xml‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,6 @@
66
<xpath expr="//section" position="attributes">
77
<attribute name="class" add="o_cc o_cc5 o_colored_level" separator=" "/>
88
</xpath>
9-
<!-- Card #1 -->
10-
<xpath expr="//div[hasclass('card')]" position="attributes">
11-
<attribute name="class" add="bg-o-color-1" remove="bg-200" separator=" "/>
12-
</xpath>
13-
<!-- Card #1 - First list item -->
14-
<xpath expr="//li[hasclass('list-group-item')]" position="replace" mode="inner">
15-
Basic sales &amp; marketing
16-
</xpath>
17-
<!-- Card #1 - Button -->
18-
<xpath expr="//a[hasclass('btn')]" position="attributes">
19-
<attribute name="class" add="btn-secondary" remove="btn-primary" separator=" "/>
20-
</xpath>
21-
<!-- Card #2 -->
22-
<xpath expr="(//div[hasclass('card')])[2]" position="attributes">
23-
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-5" separator=" "/>
24-
</xpath>
25-
<!-- Card #2 - Button -->
26-
<xpath expr="(//a[hasclass('btn')])[2]" position="attributes">
27-
<attribute name="class" add="btn-secondary" remove="btn-primary" separator=" "/>
28-
</xpath>
29-
<!-- Card #3 -->
30-
<xpath expr="(//div[hasclass('card')])[3]" position="attributes">
31-
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
32-
</xpath>
33-
<!-- Card #3 - Button -->
34-
<xpath expr="(//a[hasclass('btn')])[3]" position="attributes">
35-
<attribute name="class" add="btn-secondary" remove="btn-primary" separator=" "/>
36-
</xpath>
379
</template>
3810

3911
</odoo>

‎theme_beauty/views/snippets/s_comparisons.xml‎

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

44
<template id="s_comparisons" inherit_id="website.s_comparisons">
5-
<!-- Card #1 -->
6-
<xpath expr="//div[hasclass('card')]" position="attributes">
7-
<attribute name="class" add="bg-o-color-3" remove="bg-200" separator=" "/>
8-
</xpath>
95
<!-- Card #2 -->
10-
<xpath expr="(//div[hasclass('card')])[2]" position="attributes">
11-
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-5" separator=" "/>
12-
</xpath>
136
<xpath expr="(//div[hasclass('card')])[2]//a[hasclass('btn')]" position="attributes">
147
<attribute name="class" add="btn-secondary" remove="btn-primary" separator=" "/>
158
</xpath>

‎theme_bewise/views/customizations.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,8 @@
374374

375375
<!-- ======== COMPARISONS ======== -->
376376
<template id="s_comparisons" inherit_id="website.s_comparisons" name="Be Wise s_comparisons">
377-
<xpath expr="//div[hasclass('card')]//li[hasclass('list-group-item')]" position="replace" mode="inner">
378-
Basic sales &amp; marketing
377+
<xpath expr="(//a[hasclass('btn')])[3]" position="attributes">
378+
<attribute name="class" add="btn-success" remove="btn-outline-primary" separator=" "/>
379379
</xpath>
380380
</template>
381381

‎theme_bookstore/views/snippets/s_comparisons.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<template id="s_comparisons" inherit_id="website.s_comparisons">
55
<!-- Left card -->
66
<xpath expr="//div[hasclass('row')]//div" position="attributes">
7-
<attribute name="class" add="pt64" remove="pt32" separator=" "/>
7+
<attribute name="class" add="pt16" separator=" "/>
88
</xpath>
99
<!-- Right card -->
1010
<xpath expr="//div[hasclass('row')]//div[3]" position="attributes">
11-
<attribute name="class" add="pt64" remove="pt32" separator=" "/>
11+
<attribute name="class" add="pt16" separator=" "/>
1212
</xpath>
1313
</template>
1414

‎theme_buzzy/views/snippets/s_comparisons.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
</xpath>
99
<!-- Box #1 -->
1010
<xpath expr="//div[hasclass('row')]//div" position="attributes">
11-
<attribute name="class" add="pt88" remove="pt32" separator=" "/>
11+
<attribute name="class" add="pt16" separator=" "/>
1212
</xpath>
1313
<xpath expr="//div[hasclass('row')]//div/div" position="attributes">
14-
<attribute name="class" add="shadow bg-o-color-5" remove="bg-200" separator=" "/>
14+
<attribute name="class" add="shadow" separator=" "/>
1515
</xpath>
1616
<!-- Box #2 -->
1717
<xpath expr="//div[hasclass('row')]//div[2]/div" position="attributes">
18-
<attribute name="class" add="shadow bg-o-color-1" remove="bg-o-color-5" separator=" "/>
18+
<attribute name="class" add="shadow" separator=" "/>
1919
</xpath>
2020
<!-- Box #3 -->
2121
<xpath expr="//div[hasclass('row')]//div[3]" position="attributes">
22-
<attribute name="class" add="pt88" remove="pt32" separator=" "/>
22+
<attribute name="class" add="pt16" separator=" "/>
2323
</xpath>
2424
<xpath expr="//div[hasclass('row')]//div[3]/div" position="attributes">
25-
<attribute name="class" add="shadow bg-o-color-5" remove="bg-o-color-2" separator=" "/>
25+
<attribute name="class" add="shadow" separator=" "/>
2626
</xpath>
2727
</template>
2828

‎theme_clean/views/snippets/s_comparisons.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@
66
<xpath expr="//section" position="attributes">
77
<attribute name="class" add="o_cc o_cc2 o_colored_level" separator=" "/>
88
</xpath>
9-
<!-- Left card -->
10-
<xpath expr="//div[hasclass('card')]" position="attributes">
11-
<attribute name="class" add="bg-o-color-2" remove="bg-200" separator=" "/>
12-
</xpath>
13-
<!-- Middle card -->
14-
<xpath expr="(//div[hasclass('card')])[2]" position="attributes">
15-
<attribute name="class" add="bg-o-color-2" remove="bg-o-color-5" separator=" "/>
16-
</xpath>
179
</template>
1810

1911
</odoo>

‎theme_graphene/views/customizations.xml‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -210,25 +210,7 @@
210210
<!-- ======== COMPARISON ======== -->
211211
<template id="s_comparisons" inherit_id="website.s_comparisons" name="Graphene s_comparisons">
212212
<xpath expr="//section" position="attributes">
213-
<attribute name="class" add="pb48 pt24 o_cc o_cc4" remove="pt32 pb32" separator=" "/>
214-
</xpath>
215-
<xpath expr="//div[hasclass('row')]/div//a" position="replace">
216-
<a href="/contactus" class="btn btn-primary">Start Now</a>
217-
</xpath>
218-
<xpath expr="//div[hasclass('row')]/div[2]//a" position="replace">
219-
<a href="/contactus" class="btn btn-primary">Start Now</a>
220-
</xpath>
221-
<xpath expr="//div[hasclass('row')]/div[2]//li[2]" position="replace">
222-
<li class="list-group-item">Access to all modules</li>
223-
</xpath>
224-
<xpath expr="//div[hasclass('row')]/div[3]//a" position="replace">
225-
<a href="/contactus" class="btn btn-primary">Start Now</a>
226-
</xpath>
227-
<xpath expr="//div[hasclass('row')]/div[3]//li[2]" position="replace">
228-
<li class="list-group-item">Access to all modules and features</li>
229-
</xpath>
230-
<xpath expr="//div[hasclass('row')]/div[3]//li[4]" position="replace">
231-
<li class="list-group-item">24/7 support</li>
213+
<attribute name="class" add="pt24 o_cc o_cc4" remove="pt48" separator=" "/>
232214
</xpath>
233215
</template>
234216

‎theme_loftspace/views/snippets/s_comparisons.xml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,11 @@
44
<template id="s_comparisons" inherit_id="website.s_comparisons">
55
<!-- Card #1 -->
66
<xpath expr="//div[hasclass('card')]" position="attributes">
7-
<attribute name="class" add="bg-o-color-3" remove="bg-200" separator=" "/>
8-
</xpath>
9-
<!-- Card #2 -->
10-
<xpath expr="(//div[hasclass('card')])[2]" position="attributes">
11-
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-5" separator=" "/>
12-
</xpath>
13-
<!-- Card #2 - button -->
14-
<xpath expr="(//div[hasclass('card')])[2]//a[hasclass('btn')]" position="attributes">
15-
<attribute name="class" add="btn-secondary" remove="btn-primary" separator=" "/>
7+
<attribute name="class" add="bg-o-color-3" separator=" "/>
168
</xpath>
179
<!-- Card #3 -->
1810
<xpath expr="(//div[hasclass('card')])[3]" position="attributes">
19-
<attribute name="class" add="bg-o-color-3" remove="bg-o-color-2" separator=" "/>
11+
<attribute name="class" add="bg-o-color-3" separator=" "/>
2012
</xpath>
2113
</template>
2214

0 commit comments

Comments
 (0)