diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-05-10 15:20:01 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-05-10 15:20:01 +0200 |
| commit | 243a4ae5cbc07027cd3eaf0ead036b9d3586dea3 (patch) | |
| tree | a7fc43164bf3926a6c30d63f9573e6f23fc2d20c /addons/web/static/src/scss | |
| parent | 9530f1071d816d76194ee57711192f709e4d4d19 (diff) | |
| parent | 330b99f60c0fcc09e2438a1958d11bf7e1383d8d (diff) | |
[MERGE] forward port branch saas-12.1 up to 330b99f60c0
Diffstat (limited to 'addons/web/static/src/scss')
| -rw-r--r-- | addons/web/static/src/scss/bootstrap_overridden_report.scss | 2 | ||||
| -rw-r--r-- | addons/web/static/src/scss/layout_background.scss | 2 | ||||
| -rw-r--r-- | addons/web/static/src/scss/layout_boxed.scss | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/addons/web/static/src/scss/bootstrap_overridden_report.scss b/addons/web/static/src/scss/bootstrap_overridden_report.scss new file mode 100644 index 00000000000..a6e1cd23b32 --- /dev/null +++ b/addons/web/static/src/scss/bootstrap_overridden_report.scss @@ -0,0 +1,2 @@ +// remove Noto Color Emoji +$font-family-sans-serif: "Noto", "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; diff --git a/addons/web/static/src/scss/layout_background.scss b/addons/web/static/src/scss/layout_background.scss index caeb1f0c2bf..93ac948b2ad 100644 --- a/addons/web/static/src/scss/layout_background.scss +++ b/addons/web/static/src/scss/layout_background.scss @@ -1,5 +1,5 @@ .o_background_footer, .o_background_header, .o_report_layout_background { - font-family: 'Lato'; + font-family: 'Lato', 'Noto'; color: gray('700'); } .o_background_header { diff --git a/addons/web/static/src/scss/layout_boxed.scss b/addons/web/static/src/scss/layout_boxed.scss index bf19b6fb7ae..2129f583b21 100644 --- a/addons/web/static/src/scss/layout_boxed.scss +++ b/addons/web/static/src/scss/layout_boxed.scss @@ -1,5 +1,5 @@ .o_boxed_footer, .o_boxed_header, .o_report_layout_boxed { - font-family: 'Lato'; + font-family: 'Lato' 'Noto'; color: gray('700'); font-size: 12px; } |