summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorMartin Trigaux <mat@odoo.com>2019-04-15 09:23:48 +0000
committerMartin Trigaux <mat@odoo.com>2019-04-15 12:14:40 +0000
commit42530b02fe149df5c0080130fa5f2aacb369eef9 (patch)
tree247defac6018be4d6d6b4b5d6f523fde5a097b96 /addons
parent02a321cffb2da60a86b960e75c445e37094567b4 (diff)
[FIX] web_editor: override fonts in reports
Fixes odoo/odoo#27487 Noto Color Emoji produces an error on wkhtmltopdf, cf wkhtmltopdf/wkhtmltopdf#4149 In the backend assets, the $font-family-sans-serif is changed in web/static/src/scss/bootstrap_overridden.scss In the reports assets, the $font-family-sans-serif was NOT changed in web_editor/static/src/scss/bootstrap_overridden.scss The default boostrap fonts were still used in reports, ignoring the changes made for backend. closes odoo/odoo#32312 Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
Diffstat (limited to 'addons')
-rw-r--r--addons/web_editor/static/src/scss/bootstrap_overridden.scss2
1 files changed, 2 insertions, 0 deletions
diff --git a/addons/web_editor/static/src/scss/bootstrap_overridden.scss b/addons/web_editor/static/src/scss/bootstrap_overridden.scss
index 5c64d275d56..849a891392b 100644
--- a/addons/web_editor/static/src/scss/bootstrap_overridden.scss
+++ b/addons/web_editor/static/src/scss/bootstrap_overridden.scss
@@ -83,3 +83,5 @@ $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;