diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:42:10 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:42:10 +0200 |
| commit | 2b3017974bc7cd4b3a74f83c956224cfe4e5a918 (patch) | |
| tree | ff6aab8dc6bfa7afbe9ef714ca157ebc0185d2fd /addons/web_editor/views/editor.xml | |
| parent | 8ed8b46f6434a2a3adea69e0134317e30bf9b936 (diff) | |
| parent | 519594e9cab9a6362ef7c3e911605e4507a0a008 (diff) | |
[MERGE] *: migrate Bootstrap 3.3.7 to 4.1.3
See sub-commits for details.
task-49280
Closes https://github.com/odoo/odoo/pull/25045
Diffstat (limited to 'addons/web_editor/views/editor.xml')
| -rw-r--r-- | addons/web_editor/views/editor.xml | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/addons/web_editor/views/editor.xml b/addons/web_editor/views/editor.xml index 3d7d36f18a9..9fa14472206 100644 --- a/addons/web_editor/views/editor.xml +++ b/addons/web_editor/views/editor.xml @@ -66,6 +66,12 @@ </xpath> </template> +<template id="_assets_backend_helpers" inherit_id="web._assets_backend_helpers"> + <xpath expr="//link[last()]" position="after"> + <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/web_editor.common.bootstrap.scss"/> + </xpath> +</template> + <template id="assets_backend" inherit_id="web.assets_backend" name="Web Editor Backend Assets (used in backend interface)"> <xpath expr="link[last()]" position="after"> <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/web_editor.common.scss"/> <!-- not in common because compiled differently with context --> @@ -76,6 +82,12 @@ </xpath> </template> +<template id="_assets_frontend_helpers" inherit_id="web._assets_frontend_helpers"> + <xpath expr="//link[last()]" position="after"> + <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/web_editor.common.bootstrap.scss"/> + </xpath> +</template> + <template id="assets_frontend" inherit_id="web.assets_frontend" name="Web Editor Frontend Assets (used in public odoo)" priority="15"> <xpath expr="//link[last()]" position="after"> <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/web_editor.common.scss"/> <!-- not in common because compiled differently with context --> @@ -149,11 +161,9 @@ </div> <div class="o_colorpicker_section" data-name="grayscale" data-icon-class="fa fa-database"> <button data-color="white">White</button> - <button data-color="gray-lighter">Gray Lighter</button> - <button data-color="gray-light">Gray Light</button> - <button data-color="gray">Gray</button> - <button data-color="gray-dark">Gray Dark</button> - <button data-color="gray-darker">Gray Darker</button> + <t t-foreach="[100, 200, 300, 400, 500, 600, 700, 800, 900]" t-as="gray"> + <button t-att-data-color="gray">Gray <t t-esc="gray"/></button> + </t> <button data-color="black">Black</button> </div> <div class="o_colorpicker_section" data-name="ui" data-icon-class="fa fa-paint-brush"> |