diff options
| author | Julien Veyssier <julien-nc@posteo.net> | 2023-07-21 17:29:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-21 17:29:14 +0200 |
| commit | 1b9593b4ce4c2fde1fc6e9f63272acfadc82ed54 (patch) | |
| tree | 5e32d1d32e90d03c1a814f5d72fc2c8bfbb7b264 /apps | |
| parent | 41af382d6881ba3e9b10b033a1def62a52126bdc (diff) | |
| parent | d0957ffd977839367b376fae55b48ae34440350e (diff) | |
| download | nextcloud-server-1b9593b4ce4c2fde1fc6e9f63272acfadc82ed54.tar.gz nextcloud-server-1b9593b4ce4c2fde1fc6e9f63272acfadc82ed54.zip | |
Merge branch 'master' into fix/39526/dashboard-hide-weather-credits
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/theming/css/default.css | 2 | ||||
| -rw-r--r-- | apps/theming/lib/Themes/DefaultTheme.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index e4f0652472d..71b4cca6ff3 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 e73b2c03fda..75d738f12ee 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, 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)" |