summaryrefslogtreecommitdiff
path: root/addons/web_editor/views/editor.xml
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2018-12-21 10:37:10 +0000
committerqsm-odoo <qsm@odoo.com>2018-12-26 17:25:23 +0000
commit52ec536cef2ec84af0b36746f19a8cdf9f23fe2a (patch)
tree003b9e782fa078866d56f71a926338a65379e080 /addons/web_editor/views/editor.xml
parentec48392e39e551d9784f0431aa818f280edf9ce3 (diff)
[REF] *: make stronger bootstrap assets
* portal, theme_bootswatch, web, web_editor, website With less2sass and bs3tobs4 tasks, the assets structure was reviewed to handle the specificities of both framework and to prepare for our next odoo tasks. In particular, the assets_helpers and bootstrap overrides were basically split into 4 parts: utils, primary variables, secondary variables and bootstrap variables. (see https://github.com/odoo/odoo/commit/6e4db7d13a926845bf82f5b035afede42d6d5a89) Using the !default system for the bootstrap variables parts seems now a good improvement. This is part of what this commit does: adding the default flag for all bootstrap variables overrides and inverting the order of the files in the _assets_backend_helpers and _assets_frontend_helpers templates. This allows to avoid code like this: portal: ``` $body-bg: white; ``` website: ``` @​if $var != null { $body-bg: $var; } ``` This code makes the body white with portal or equal to $var with website if $var has a value. The same behavior in the new file order is achieved with: website: ``` $body-bg: $var !default; ``` portal: ``` $body-bg: white !default; ``` This order is now also followed for the _assets_secondary_variables templates (there are only a few). This commit also make better assets hierarchy by making website inherit from portal assets (instead of web) and portal inherit from web_editor assets (instead of web) (thus relying on strong dependencies instead of installation order which is not always right for migrated databases). closes odoo/odoo#29757
Diffstat (limited to 'addons/web_editor/views/editor.xml')
-rw-r--r--addons/web_editor/views/editor.xml10
1 files changed, 8 insertions, 2 deletions
diff --git a/addons/web_editor/views/editor.xml b/addons/web_editor/views/editor.xml
index d180831b616..ac8b3c396f3 100644
--- a/addons/web_editor/views/editor.xml
+++ b/addons/web_editor/views/editor.xml
@@ -58,6 +58,12 @@
</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"/>
+ </xpath>
+</template>
+
<template id="assets_common" inherit_id="web.assets_common" name="Web Editor Common Assets (used in backend interface and website)">
<xpath expr="script[last()]" position="after">
<script type="text/javascript" src="/web_editor/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
@@ -67,7 +73,7 @@
</template>
<template id="_assets_backend_helpers" inherit_id="web._assets_backend_helpers">
- <xpath expr="//link[last()]" position="after">
+ <xpath expr="//link" position="before">
<link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/bootstrap_overridden.scss"/>
</xpath>
</template>
@@ -83,7 +89,7 @@
</template>
<template id="_assets_frontend_helpers" inherit_id="web._assets_frontend_helpers">
- <xpath expr="//link[last()]" position="after">
+ <xpath expr="//link" position="before">
<link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/bootstrap_overridden.scss"/>
</xpath>
</template>