From fd26faa3d96b447d34fd6664f49ee621b1dfdbe8 Mon Sep 17 00:00:00 2001 From: Tim Down <158919+timdown@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:01:50 +0000 Subject: [PATCH] Merge pull request #17190 from overleaf/td-bs5-default-typography Change default fonts in Bootstrap 5 GitOrigin-RevId: e60b6f32ae639a47353f1a73179c8e1e25edcd52 --- services/web/frontend/stylesheets/bootstrap-5/main-style.scss | 3 ++- .../bootstrap-5/scss/bootstrap-variable-overrides/fonts.scss | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/web/frontend/stylesheets/bootstrap-5/main-style.scss b/services/web/frontend/stylesheets/bootstrap-5/main-style.scss index 2ea64de465..cee84391c1 100644 --- a/services/web/frontend/stylesheets/bootstrap-5/main-style.scss +++ b/services/web/frontend/stylesheets/bootstrap-5/main-style.scss @@ -1,5 +1,6 @@ // Web fonts -@import '../../fonts/lato.css'; +@import '../../fonts/noto-sans'; +@import '../../fonts/dm-mono'; @import '../../fonts/merriweather.css'; @import '../../fonts/source-code-pro.css'; @import '../../fonts/stix-two-math.css'; diff --git a/services/web/frontend/stylesheets/bootstrap-5/scss/bootstrap-variable-overrides/fonts.scss b/services/web/frontend/stylesheets/bootstrap-5/scss/bootstrap-variable-overrides/fonts.scss index 2a7093d585..5bd443436b 100644 --- a/services/web/frontend/stylesheets/bootstrap-5/scss/bootstrap-variable-overrides/fonts.scss +++ b/services/web/frontend/stylesheets/bootstrap-5/scss/bootstrap-variable-overrides/fonts.scss @@ -1,8 +1,8 @@ // This file provides overrides for Bootstrap 5's default font-related Sass variables -$font-family-sans-serif: 'Lato', sans-serif; +$font-family-sans-serif: 'Noto Sans', sans-serif; $font-family-serif: 'Merriweather', serif; -$font-family-monospace: 'Menlo', 'Monaco', 'Consolas', 'Courier New', monospace; +$font-family-monospace: 'DM Mono', monospace; $font-size-base: $default-font-size; $line-height-base: $default-line-height;