Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon L <szaimen@e.mail.de>2022-03-08 15:49:59 +0300
committerGitHub <noreply@github.com>2022-03-08 15:49:59 +0300
commite26c56b4a60d8b33cd5b64111c98f1849439c53f (patch)
treec0e654302b12b137f2c494791503cf6be25cf8f5
parent86a375ef57c98bacc3e2956f1b0d00a6415c332e (diff)
parent08edf866831d80002796449040099ff6211b0cf0 (diff)
Merge pull request #30968 from nextcloud/backport/25418/stable22
[stable22] Update variables.scss - Fallback font before Noto Color Emoji
-rw-r--r--core/css/variables.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/css/variables.scss b/core/css/variables.scss
index 84646379ef1..56145e47471 100644
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -97,7 +97,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, 'Noto Color Emoji', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol' !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;
$default-font-size: 15px;
$default-line-height: 24px;