diff options
| author | qsm-odoo <qsm@odoo.com> | 2019-01-04 11:23:42 +0000 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2019-01-04 11:27:07 +0000 |
| commit | 70f35620babdfdf43e2c603efbf37f2cf7399240 (patch) | |
| tree | 701adf8b8ddb96ac688c5487297ffd5a147b91b4 /addons/web_editor/views/editor.xml | |
| parent | c2c5785940bfdd0eb620ba39ae3697ec63426915 (diff) | |
[FIX] web_editor: restore backend colors
Commit https://github.com/odoo/odoo/commit/52ec536cef2ec84af0b36746f19a8cdf9f23fe2a
made a mistake which made the backend use the website colors. This is
because the web_editor app adds its bootstrap_overridden.scss file in
both backend and frontend assets as the backend needs the editor colors
(alpha, beta, ...). However, the 'primary', 'secondary', etc that the
backend customizes should not be overridden by the web_editor. Therefore
the file contained a hack to determine if it is the backend or not...
hack which did not work anymore with the new system the mentioned
commit implements.
Also some comments were not adapted correctly by the mentioned commit.
closes odoo/odoo#29935
Diffstat (limited to 'addons/web_editor/views/editor.xml')
| -rw-r--r-- | addons/web_editor/views/editor.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/addons/web_editor/views/editor.xml b/addons/web_editor/views/editor.xml index ac8b3c396f3..b67d8ee7771 100644 --- a/addons/web_editor/views/editor.xml +++ b/addons/web_editor/views/editor.xml @@ -74,6 +74,7 @@ <template id="_assets_backend_helpers" inherit_id="web._assets_backend_helpers"> <xpath expr="//link" position="before"> + <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/bootstrap_overridden_backend.scss"/> <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/bootstrap_overridden.scss"/> </xpath> </template> |