pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] theme_bootswatch, *: prevent website to interfer with bootswatch

Browse Source 
* website

Default web_editor/website colors and other bootstrap related variables
took precedence over some bootswatch overriddes. While we have the
control with Odoo themes, theme bootswatch is a library we do not want
to modify. This commit removes the web_editor and website customizations
when bootswatch is installed.

Closes https://github.com/odoo/odoo/issues/27821

closes odoo/odoo#27855
This commit is contained in:
qsm-odoo
2018-10-16 14:26:37 +00:00
parent 3b4eeee5ca
commit 574450bad8
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/theme_bootswatch/views/theme_bootswatch_templates.xml
+6
View File
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<!-- Remove Odoo bootstrap overridde -->
<template id="_assets_frontend_helpers" inherit_id="web._assets_frontend_helpers">
<xpath expr="//link[@href='/web_editor/static/src/scss/bootstrap_overridden.scss']" position="replace"/>
<xpath expr="//link[@href='/website/static/src/scss/bootstrap_overridden.scss']" position="replace"/>
</template>
<template id="theme_customize" inherit_id="website.theme_customize">
<xpath expr="//div" position="replace">
<div>
addons/website/static/src/scss/website.scss
+8 -4
View File
@@ -56,14 +56,18 @@ $-font-numbers: (
// anyway. Automatically mimic navbar-dark if the user's menu color is dark.
// Note: this only works because navbar-light is defined before navbar-dark,
// we may want to use a safest way when possible.
background-color: color('menu') !important;
@if (color-yiq(color('menu')) != $yiq-text-dark) {
@extend .navbar-dark;
@if color('menu') {
background-color: color('menu') !important;
@if (color-yiq(color('menu')) != $yiq-text-dark) {
@extend .navbar-dark;
}
}
}
.o_footer {
@include o-bg-color(color('footer'));
@if color('footer') {
@include o-bg-color(color('footer'));
}
> #footer {
// FIXME needed to prevent the dropzone at the bottom of the #wrap element