summaryrefslogtreecommitdiff
path: root/addons/web_editor/views/editor.xml
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2020-05-28 10:04:46 +0000
committerqsm-odoo <qsm@odoo.com>2020-06-02 09:42:19 +0000
commit7736cde22c3bce06305045a818a2d70892cf25ef (patch)
tree2b42b79b891c9d569517b34eade2957fa174679d /addons/web_editor/views/editor.xml
parentade27dd08dd8a4aebebe04665171c1c39a00b338 (diff)
[IMP] web_editor, website, *: use new color names
*: mass_mailing, website_blog, website_forum, website_hr_recruitment Deprecate alpha, beta, gamma, delta and espilon color names and now use a new color system: o-color-x, with x from 1 to 5. This will allow to review the colors of all themes to have nice visuals for the new color combinations classes, without breaking the current uses of bg-alpha, alert-delta, etc in current websites of customers (by keeping the old color and classes for compatibility). This will also allow to uniformize all themes under the same conventions to enforce BS color override: - o-color-1 used as primary (as before, for alpha) - o-color-2 used as secondary (as before, for beta) Before, some themes were not following the 2 guidelines. The users using those themes will simply have the possibility to choose o-color-1 and o-color-2 colors accordingly to restore their website without breaking the new system features. Another change is that those colors are defined through color palettes and not theme color palettes. This will avoid them to generate automatic bootstrap classes which we don't want (alert, btn) and generate the one we want by ourself. Note: for mass mailing, the colors and classes also have been renamed but the system stays unchanged. Part of https://github.com/odoo/odoo/pull/45856 task-2197038
Diffstat (limited to 'addons/web_editor/views/editor.xml')
-rw-r--r--addons/web_editor/views/editor.xml12
1 files changed, 7 insertions, 5 deletions
diff --git a/addons/web_editor/views/editor.xml b/addons/web_editor/views/editor.xml
index 2ebd3ff40b5..2769509a927 100644
--- a/addons/web_editor/views/editor.xml
+++ b/addons/web_editor/views/editor.xml
@@ -120,6 +120,12 @@
</xpath>
</template>
+<template id="_assets_13_0_color_system_support_primary_variables" inherit_id="web_editor._assets_primary_variables" active="False">
+ <xpath expr="//link[last()]" position="after">
+ <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/13_0_color_system_support_primary_variables.scss"/>
+ </xpath>
+</template>
+
<template id="_assets_secondary_variables" inherit_id="web._assets_secondary_variables">
<xpath expr="//link" position="before">
<link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/secondary_variables.scss"/>
@@ -212,11 +218,7 @@
<template id="web_editor.colorpicker" name="Color-Picker" groups="base.group_user">
<colorpicker>
<div class="o_colorpicker_section" data-name="theme">
- <button data-color="alpha"></button>
- <button data-color="beta"></button>
- <button data-color="gamma"></button>
- <button data-color="delta"></button>
- <button data-color="epsilon"></button>
+ <button t-foreach="5" t-as="i" t-attf-data-color="o-color-#{i + 1}"></button>
</div>
<div class="o_colorpicker_section" data-name="common">
<button data-color="black"></button>