mirror of
https://github.com/odoo/design-themes.git
synced 2025-10-07 01:18:52 +07:00
Benoit Socias
76e9cbcdb6
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
37 lines
1.5 KiB
XML
37 lines
1.5 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<odoo>
|
|
|
|
<template id="s_image_text" inherit_id="website.s_image_text">
|
|
<!-- Section -->
|
|
<xpath expr="//section" position="attributes">
|
|
<attribute name="class" add="o_cc o_cc1 pb48 pt48" remove="pb32 pt32" separator=" "/>
|
|
</xpath>
|
|
|
|
<!-- Title -->
|
|
<xpath expr="//h2" position="replace" mode="inner">
|
|
Bored with your interior?
|
|
</xpath>
|
|
|
|
<!-- Paragraph -->
|
|
<xpath expr="//p[1]" position="replace" mode="inner">
|
|
Our decoration experts are at your disposal to guide you step by step in the design of your interior and will give you the best advice for your interior design.
|
|
</xpath>
|
|
<xpath expr="//p[2]" position="replace" mode="inner">
|
|
Discover our tailor-made services to embellish the decoration of your home.
|
|
</xpath>
|
|
<xpath expr="//p[3]" position="replace">
|
|
<p><a href="#" class="btn btn-primary">Explore our services</a></p>
|
|
</xpath>
|
|
|
|
<!-- Image -->
|
|
<xpath expr="//img" position="attributes">
|
|
<attribute name="src">/web_editor/image_shape/website.s_image_text_default_image/web_editor/solid/solid_square_2.svg?c1=o-color-3</attribute>
|
|
<attribute name="data-shape">web_editor/solid/solid_square_2</attribute>
|
|
<attribute name="data-original-mimetype">image/jpeg</attribute>
|
|
<attribute name="data-file-name">s_image_text.svg</attribute>
|
|
<attribute name="data-shape-colors">o-color-3;;;;</attribute>
|
|
</xpath>
|
|
</template>
|
|
|
|
</odoo>
|