[FIX] web: change bootstrap fonts only for reports
Commit42530b02fewas fixing a bug in reports that were using the standard bootstrap fonts instead of the changes we made in $font-family-sans-serif To solve this,42530b02fereplicated the change in the file web_editor/static/src/scss/bootstrap_overridden.scss which is imported in report_assets_common **before** web._assets_bootstrap This was solving the issue for the report but had also the side-effect of changing body font-family in enterprise as the bootstrap_overridden.scss file is also used in web_editor._assets_backend_helpers and web_editor._assets_frontend_helpers42530b02fehad effect only on enterprise where the desired font is Roboto/Noto Create a new bootstrap_overridden (6th of the name) file only for report closes odoo/odoo#32902 Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
This commit is contained in:
@@ -0,0 +1,2 @@
|
||||
// remove Noto Color Emoji
|
||||
$font-family-sans-serif: "Noto", "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
|
||||
@@ -6,6 +6,7 @@
|
||||
<t t-call="web._assets_helpers"><t t-set="no_bs_vars" t-value="True"/></t>
|
||||
|
||||
<!-- FIXME web_editor ? -->
|
||||
<link rel="stylesheet" type="text/scss" href="/web/static/src/scss/bootstrap_overridden_report.scss"/>
|
||||
<link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/bootstrap_overridden.scss"/>
|
||||
<t t-call="web._assets_bootstrap"/>
|
||||
|
||||
|
||||
@@ -83,5 +83,3 @@ $gray-700: gray('700') !default;
|
||||
$gray-800: gray('800') !default;
|
||||
$gray-900: gray('900') !default;
|
||||
$black: gray('black') !default;
|
||||
|
||||
$font-family-sans-serif: "Noto", "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
|
||||
|
||||
Reference in New Issue
Block a user