Skip to content

Commit 991dfa5

Browse files
anso-odooanso-odoo
committed
[FIX] theme_*: adapt snippets after secondary color fixes
*: anelusia, artists, avantgarde, aviato, beauty, bewise, bistro, bookstore, buzzy, clean, cobalt, enark, kea, kiddo, loftspace, monglia, nano, notes, odoo_experts, orchid, paptic, real_estate, treehouse, vehicle, yes, zap This commit adapts multiple snippets after they were changed in the community counterpart of this PR. task-5072830 closes #1148 X-original-commit: 233a091 Related: odoo/odoo#227101 Signed-off-by: Quentin Smetz (qsm) <[email protected]> Signed-off-by: Antoine Sougné (anso) <[email protected]>
1 parent 7bb8e73 commit 991dfa5

File tree

61 files changed

+172
-445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+172
-445
lines changed

‎theme_anelusia/views/snippets/s_numbers_boxed.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
</xpath>
1313
<!-- Grid Item -->
1414
<xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
15-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
15+
<attribute name="class" add="o_cc o_cc4" separator=" "/>
1616
</xpath>
1717
<xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
1818
30+
1919
</xpath>
2020
<!-- Grid Item 2 -->
2121
<xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
22-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
22+
<attribute name="class" add="o_cc o_cc4" separator=" "/>
2323
</xpath>
2424
<xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
2525
45%
2626
</xpath>
2727
<!-- Grid Item 3 -->
2828
<xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
29-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
29+
<attribute name="class" add="o_cc o_cc4" separator=" "/>
3030
</xpath>
3131
<xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
3232
8+

‎theme_anelusia/views/snippets/s_text_cover.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<template id="s_text_cover" inherit_id="website.s_text_cover">
55
<!-- Section -->
66
<xpath expr="//section" position="attributes">
7-
<attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
7+
<attribute name="class" add="o_cc1" remove="o_cc5" separator=" "/>
88
</xpath>
99
<!-- Container -->
1010
<xpath expr="//div[hasclass('row')]" position="attributes">

‎theme_artists/__manifest__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
'views/snippets/s_split_intro.xml',
114114
'views/snippets/s_form_aside.xml',
115115
'views/snippets/s_numbers_framed.xml',
116+
'views/snippets/s_company_team_card.xml',
116117
'views/new_page_template.xml',
117118
],
118119
'images': [

‎theme_aviato/views/snippets/s_company_team_card.xml‎ renamed to ‎theme_artists/views/snippets/s_company_team_card.xml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<odoo>
33

4-
<template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Aviato s_company_team_card">
4+
<template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Artists's s_company_team_card">
5+
<!-- Section -->
6+
<xpath expr="//section" position="attributes">
7+
<attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
8+
</xpath>
59
<!-- Team Member 1 -->
610
<xpath expr="//div[hasclass('card')]" position="attributes">
7-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
11+
<attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
812
</xpath>
913
<!-- Team Member 2 -->
1014
<xpath expr="(//div[hasclass('card')])[2]" position="attributes">
11-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
15+
<attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
1216
</xpath>
1317
<!-- Team Member 3 -->
1418
<xpath expr="(//div[hasclass('card')])[3]" position="attributes">
15-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
19+
<attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
1620
</xpath>
1721
<!-- Team Member 4 -->
1822
<xpath expr="(//div[hasclass('card')])[4]" position="attributes">
19-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
23+
<attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
2024
</xpath>
2125
</template>
2226

‎theme_artists/views/snippets/s_numbers_charts.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
<xpath expr="//section" position="attributes">
77
<attribute name="class" add="o_cc o_cc5" separator=" "/>
88
</xpath>
9-
<!-- Chart card -->
10-
<xpath expr="//div[hasclass('o_grid_item')]" position="attributes">
11-
<attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
12-
</xpath>
139
<!-- Progress bars -->
1410
<xpath expr="//div[hasclass('progress-bar')]" position="attributes">
15-
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
11+
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-5" separator=" "/>
1612
</xpath>
1713
<xpath expr="(//div[hasclass('progress-bar')])[2]" position="attributes">
18-
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
14+
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-5" separator=" "/>
15+
</xpath>
16+
<!-- Chart card -->
17+
<xpath expr="//div[hasclass('o_grid_item')][4]" position="attributes">
18+
<attribute name="class" add="border" remove="o_cc o_cc2" separator=" "/>
1919
</xpath>
2020
<xpath expr="(//div[hasclass('s_chart')])" position="attributes">
21-
<attribute name="data-data">{"labels":["First","Second"],"datasets":[{"label":"One","data":["25","75"],"backgroundColor":["o-color-1","o-color-2"],"borderColor":["",""]}]}</attribute>
21+
<attribute name="data-data">{"labels":["First","Second"],"datasets":[{"label":"One","data":["25","75"],"backgroundColor":["o-color-2","o-color-1"],"borderColor":["",""]}]}</attribute>
2222
</xpath>
2323
</template>
2424

‎theme_artists/views/snippets/s_text_cover.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<template id="s_text_cover" inherit_id="website.s_text_cover">
55
<!-- Section -->
66
<xpath expr="//section" position="attributes">
7-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
7+
<attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
88
</xpath>
99
<xpath expr="//h1" position="replace" mode="inner">
1010
Share Art.<br/>Effortlessly.

‎theme_avantgarde/views/customizations.xml‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -881,48 +881,28 @@
881881
<template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
882882
<!-- Grid Item -->
883883
<xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
884-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
884+
<attribute name="class" add="o_cc o_cc4" separator=" "/>
885885
</xpath>
886886
<xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
887887
30+
888888
</xpath>
889889
<!-- Grid Item 2 -->
890890
<xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
891-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
891+
<attribute name="class" add="o_cc o_cc4" separator=" "/>
892892
</xpath>
893893
<xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
894894
45%
895895
</xpath>
896896
<!-- Grid Item 3 -->
897897
<xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
898-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
898+
<attribute name="class" add="o_cc o_cc4" separator=" "/>
899899
</xpath>
900900
<xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
901901
8+
902902
</xpath>
903903

904904
</template>
905905

906-
<!-- ======== COMPANY TEAM GRID ======== -->
907-
<template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Avantgarde s_company_team_card">
908-
<!-- Team Member 1 -->
909-
<xpath expr="//div[hasclass('card')]" position="attributes">
910-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
911-
</xpath>
912-
<!-- Team Member 2 -->
913-
<xpath expr="(//div[hasclass('card')])[2]" position="attributes">
914-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
915-
</xpath>
916-
<!-- Team Member 3 -->
917-
<xpath expr="(//div[hasclass('card')])[3]" position="attributes">
918-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
919-
</xpath>
920-
<!-- Team Member 4 -->
921-
<xpath expr="(//div[hasclass('card')])[4]" position="attributes">
922-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
923-
</xpath>
924-
</template>
925-
926906
<!-- ======== SPLIT INTRO ======== -->
927907
<template id="s_split_intro" inherit_id="website.s_split_intro">
928908
<!-- Title -->

‎theme_aviato/__manifest__.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
'views/snippets/s_striped_center_top.xml',
4242
'views/snippets/s_showcase.xml',
4343
'views/snippets/s_quadrant.xml',
44-
'views/snippets/s_company_team_card.xml',
4544
'views/snippets/s_unveil.xml',
4645
'views/snippets/s_accordion_image.xml',
4746
'views/snippets/s_key_benefits.xml',

‎theme_aviato/views/snippets/s_numbers_boxed.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
</xpath>
1313
<!-- Grid Item -->
1414
<xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
15-
<attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
15+
<attribute name="class" add="o_cc o_cc1" separator=" "/>
1616
</xpath>
1717
<xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
1818
30+
1919
</xpath>
2020
<!-- Grid Item 2 -->
2121
<xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
22-
<attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
22+
<attribute name="class" add="o_cc o_cc1" separator=" "/>
2323
</xpath>
2424
<xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
2525
45%
2626
</xpath>
2727
<!-- Grid Item 3 -->
2828
<xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
29-
<attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
29+
<attribute name="class" add="o_cc o_cc1" separator=" "/>
3030
</xpath>
3131
<xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
3232
8+

‎theme_beauty/views/snippets/s_numbers_boxed.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
</xpath>
1313
<!-- Grid Item -->
1414
<xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
15-
<attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
15+
<attribute name="class" add="o_cc o_cc1" separator=" "/>
1616
</xpath>
1717
<xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
1818
30+
1919
</xpath>
2020
<!-- Grid Item 2 -->
2121
<xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
22-
<attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
22+
<attribute name="class" add="o_cc o_cc1" separator=" "/>
2323
</xpath>
2424
<xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
2525
45%
2626
</xpath>
2727
<!-- Grid Item 3 -->
2828
<xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
29-
<attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
29+
<attribute name="class" add="o_cc o_cc1" separator=" "/>
3030
</xpath>
3131
<xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
3232
8+

0 commit comments

Comments
 (0)