From 60d6c5402b3ecb705756a566b3e712b7bd8c0dcc Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 24 Apr 2019 08:51:34 +0000 Subject: [FIX] web: change bootstrap fonts only for reports Commit 42530b02fe14 was 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, 42530b02fe14 replicated 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_helpers 42530b02fe14 had 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) --- addons/web_editor/static/src/scss/bootstrap_overridden.scss | 2 -- 1 file changed, 2 deletions(-) (limited to 'addons/web_editor/static/src/scss/bootstrap_overridden.scss') diff --git a/addons/web_editor/static/src/scss/bootstrap_overridden.scss b/addons/web_editor/static/src/scss/bootstrap_overridden.scss index 849a891392b..5c64d275d56 100644 --- a/addons/web_editor/static/src/scss/bootstrap_overridden.scss +++ b/addons/web_editor/static/src/scss/bootstrap_overridden.scss @@ -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; -- cgit v1.2.3