From 9352869f520d657318ab1acedb016433f923ad5a Mon Sep 17 00:00:00 2001 From: Simon L Date: Mon, 26 Jun 2023 12:52:50 +0200 Subject: [PATCH] switch to bootstrap font-stack Signed-off-by: Simon L --- apps/theming/lib/Themes/DefaultTheme.php | 2 +- core/css/guest.scss | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php index e73b2c03fda..417478d8716 100644 --- a/apps/theming/lib/Themes/DefaultTheme.php +++ b/apps/theming/lib/Themes/DefaultTheme.php @@ -171,7 +171,7 @@ class DefaultTheme implements ITheme { '--color-border-dark' => $this->util->darken($colorMainBackground, 14), '--color-border-maxcontrast' => $this->util->darken($colorMainBackground, 42), - '--font-face' => "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', Arial, sans-serif, 'Noto Color Emoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'", + '--font-face' => "system-ui, -apple-system, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', 'Liberation Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';", '--default-font-size' => '15px', // TODO: support "(prefers-reduced-motion)" diff --git a/core/css/guest.scss b/core/css/guest.scss index 2b288b78738..30b2355bf07 100644 --- a/core/css/guest.scss +++ b/core/css/guest.scss @@ -24,7 +24,7 @@ body { /* bring the default font size up to 14px */ font-size: .875em; line-height: 1.6em; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; + font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; color: var(--color-text); text-align: center; /* As guest, there is no color-background-plain */ @@ -214,7 +214,7 @@ form #datadirField legend { input, textarea, select, button, div[contenteditable=true] { - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; + font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; } input, input:not([type='range']), -- 2.39.5