diff options
| -rw-r--r-- | apps/theming/css/default.css | 2 | ||||
| -rw-r--r-- | apps/theming/lib/Themes/DefaultTheme.php | 2 | ||||
| -rw-r--r-- | core/css/guest.scss | 4 | ||||
| -rw-r--r-- | core/css/variables.scss | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index e4f0652472d..edcc8f93de2 100644 --- a/apps/theming/css/default.css +++ b/apps/theming/css/default.css @@ -40,7 +40,7 @@ --color-border: #ededed; --color-border-dark: #dbdbdb; --color-border-maxcontrast: #949494; - --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, Oxygen-Sans, Cantarell, Ubuntu, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; --default-font-size: 15px; --animation-quick: 100ms; --animation-slow: 300ms; diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php index bae914c3c9c..6c3e6d5fbb9 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' => "system-ui, -apple-system, 'Segoe UI', Roboto, 'Helvetica Neue', 'Noto Sans', 'Liberation Sans', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';", + '--font-face' => "system-ui, -apple-system, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', 'Noto Sans', 'Liberation Sans', Arial, 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 e845e448a4f..50a3960ead9 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: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + font-family: system-ui, -apple-system, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, Ubuntu, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, 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: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + font-family: system-ui, -apple-system, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, Ubuntu, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; } input, input:not([type='range']), diff --git a/core/css/variables.scss b/core/css/variables.scss index 164a69a6857..625ba011322 100644 --- a/core/css/variables.scss +++ b/core/css/variables.scss @@ -95,7 +95,7 @@ $border-radius-large: 10px !default; // Pill-style button, value is large so big buttons also have correct roundness $border-radius-pill: 100px !default; -$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' !default; +$font-face: system-ui, -apple-system, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, Ubuntu, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; $default-font-size: 15px; $default-line-height: 24px; |