mirror of
https://github.com/odoo/design-themes.git
synced 2025-10-07 01:18:52 +07:00
[FIX] theme_*: remove duplicate and conflicting classes
When default snippets have been updated to rely on color presets ([1]),
some themes were not adapted accordingly.
This also happened whenever paddings of base blocks were modified.
Because of this there are elements in themes for which some classes are
applied several times, and some where classes are not removed before
adding a contradicting one.
This commit adjusts the classes so that themes neither:
- produce snippets with duplicated classes
- produce snippets with contradicting classes (e.g. two different
bottom paddings on the same element)
This commit also fixes a typo from [2] which was the source of
duplicate classes.
[1]: https://github.com/odoo/odoo/commit/5953c4df6b9c08519f64a65c1cf5d5558d59f7d4
[2]: https://github.com/odoo/design-themes/commit/299d504df31bf179775eec1d37e71605c3637460#diff-86c142838104de06e89f629c51cf791464538dc8899e6a3f00c24f69638db409R34
task-3562147
X-original-commit: f3da06dc68
Part-of: odoo/design-themes#744
This commit is contained in:
@@ -14,14 +14,14 @@
|
||||
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-5" separator=" "/>
|
||||
</xpath>
|
||||
<xpath expr="(//div[hasclass('card')])[2]//a[hasclass('btn')]" position="attributes">
|
||||
<attribute name="class" add="btn-secondary" remove="bg-primary" separator=" "/>
|
||||
<attribute name="class" add="btn-secondary" remove="btn-primary" separator=" "/>
|
||||
</xpath>
|
||||
<!-- Box #03 -->
|
||||
<xpath expr="//div[hasclass('row')]//div[3]" position="attributes">
|
||||
<attribute name="class" add="pt80" remove="pt32" separator=" "/>
|
||||
</xpath>
|
||||
<xpath expr="(//div[hasclass('card')])[3]" position="attributes">
|
||||
<attribute name="class" add="bg-o-color-3" remove="bg-secondary" separator=" "/>
|
||||
<attribute name="class" add="bg-o-color-3" remove="bg-o-color-2" separator=" "/>
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<template id="s_media_list" inherit_id="website.s_media_list">
|
||||
<!-- Section -->
|
||||
<xpath expr="//section" position="attributes">
|
||||
<attribute name="class" add="pt120 pb120 o_cc4 o_colored_level" remove="pt32 pb32 o_cc2" separator=" "/>
|
||||
<attribute name="class" add="pt120 pb120 o_cc4" remove="pt32 pb32 o_cc2" separator=" "/>
|
||||
</xpath>
|
||||
|
||||
<!-- Row #1 -->
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<template id="s_three_columns" inherit_id="website.s_three_columns">
|
||||
<!-- Section -->
|
||||
<xpath expr="//section" position="attributes">
|
||||
<attribute name="class" add="pt72 pb72 o_colored_level" remove="pt32 pb32" separator=" "/>
|
||||
<attribute name="class" add="pt72 pb72" remove="pt32 pb32" separator=" "/>
|
||||
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/04","flip":[]}</attribute>
|
||||
</xpath>
|
||||
<!-- Shape -->
|
||||
|
||||
Reference in New Issue
Block a user