diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-06-28 17:54:40 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:36:54 +0200 |
| commit | 76f714dca8957233ba3bbca73f340fa21244f5f2 (patch) | |
| tree | 277290260fcc328428b0c23a292d521a77a6d1b3 /addons/web/views/webclient_templates.xml | |
| parent | cd3f5bbfda76da75a9c7528144020c7dfbdf81d3 (diff) | |
[REF] web, web_editor, *: review theme color extensions
* survey, website_slides
Before this commit, the web_editor app created bg and text classes its
own way for theming (alpha, beta, grays, ...). Now the system is far
more automatic by extending BS4 color maps.
Diffstat (limited to 'addons/web/views/webclient_templates.xml')
| -rw-r--r-- | addons/web/views/webclient_templates.xml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml index 57a580e0f13..de7dd3198f9 100644 --- a/addons/web/views/webclient_templates.xml +++ b/addons/web/views/webclient_templates.xml @@ -4,6 +4,7 @@ <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_functions.scss"/> <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_mixins.scss"/> <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/utils.scss"/> + <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/bs_mixins_overrides.scss"/> </template> <template id="_assets_primary_variables"> @@ -35,6 +36,12 @@ <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/bootstrap_overridden_frontend.scss"/> </template> + <template id="_assets_bootstrap"> + <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/import_bootstrap_part1.scss"/> + <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/bs_mixins_overrides.scss"/> + <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/import_bootstrap_part2.scss"/> + </template> + <template id="assets_common" name="Common Assets (used in backend interface and website)"> <t t-call="web._assets_helpers"/> @@ -128,7 +135,7 @@ <template id="assets_backend" name="Backend Assets (used in backend interface)"> <t t-call="web._assets_backend_helpers"/> - <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/import_bootstrap.scss"/> + <t t-call="web._assets_bootstrap"/> <link rel="stylesheet" type="text/scss" href="/web/static/lib/tempusdominus/tempusdominus.scss"/> <link rel="stylesheet" type="text/css" href="/base/static/src/css/modules.css"/> @@ -294,7 +301,7 @@ <template id="web.assets_frontend" name="Website Assets"> <t t-call="web._assets_frontend_helpers"/> - <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/import_bootstrap.scss"/> + <t t-call="web._assets_bootstrap"/> <link rel="stylesheet" type="text/scss" href="/web/static/lib/tempusdominus/tempusdominus.scss"/> <script type="text/javascript" src="/web/static/src/js/services/session.js"></script> |