diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-08-03 14:43:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-03 14:43:20 +0200 |
| commit | b585aefcea53d28b261a48f9c885351e286b5d60 (patch) | |
| tree | 48ed872c3bfa057176270c48f080f2dacbd2d698 /core/css | |
| parent | 1ae58385b2f80e5228c014ea036a88d9d737b5f9 (diff) | |
| parent | f32cf0ab6323dae5d1d0bb7cebff4e6a59caf097 (diff) | |
| download | nextcloud-server-b585aefcea53d28b261a48f9c885351e286b5d60.tar.gz nextcloud-server-b585aefcea53d28b261a48f9c885351e286b5d60.zip | |
Merge pull request #22075 from nextcloud/bugfix/noid/prefer-emoji-fonts-over-sans-serif
Also consider Noto Color Emoji font
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/variables.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/css/variables.scss b/core/css/variables.scss index 9ec4d2c4ca2..796b5ffe3e2 100644 --- a/core/css/variables.scss +++ b/core/css/variables.scss @@ -83,7 +83,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, '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, 'Noto Color Emoji', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol' !default; $animation-quick: 100ms; $animation-slow: 300ms; |