From 1495d97cf7f4e5e492e224fb1d389715caa41be2 Mon Sep 17 00:00:00 2001 From: Jake Jarvis Date: Tue, 3 Jan 2023 11:31:28 -0500 Subject: [PATCH] modern system font stack https://css-tricks.com/snippets/css/system-font-stack/ --- patches/glitch/system-font.patch | 6 +++--- patches/system-font.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/glitch/system-font.patch b/patches/glitch/system-font.patch index 6df7ad5..d898c6b 100644 --- a/patches/glitch/system-font.patch +++ b/patches/glitch/system-font.patch @@ -50,7 +50,7 @@ index fbb02c788..3946684ed 100644 @import 'reset'; @import 'basics'; diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss -index b865b5a2d..dc1130708 100644 +index b865b5a2d..3d05840fc 100644 --- a/app/javascript/flavours/glitch/styles/variables.scss +++ b/app/javascript/flavours/glitch/styles/variables.scss @@ -53,9 +53,9 @@ $media-modal-media-max-height: 80%; @@ -60,9 +60,9 @@ index b865b5a2d..dc1130708 100644 -$font-sans-serif: 'mastodon-font-sans-serif' !default; -$font-display: 'mastodon-font-display' !default; -$font-monospace: 'mastodon-font-monospace' !default; -+$font-sans-serif: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue" !default; ++$font-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue" !default; +$font-display: $font-sans-serif !default; -+$font-monospace: ui-monospace, Menlo, Monaco, "Cascadia Mono", "Segoe UI Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New" !default; ++$font-monospace: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas, "Liberation Mono" !default; // Avatar border size (8% default, 100% for rounded avatars) $ui-avatar-border-size: 8%; diff --git a/patches/system-font.patch b/patches/system-font.patch index e376bc0..38320a1 100644 --- a/patches/system-font.patch +++ b/patches/system-font.patch @@ -47,7 +47,7 @@ index 413a1cdd6..fccbf2763 100644 padding: 0; diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss -index 2f6c41d5f..b968ea42d 100644 +index 2f6c41d5f..5d59e8c2e 100644 --- a/app/javascript/styles/mastodon/variables.scss +++ b/app/javascript/styles/mastodon/variables.scss @@ -55,6 +55,6 @@ $media-modal-media-max-height: 80%; @@ -57,6 +57,6 @@ index 2f6c41d5f..b968ea42d 100644 -$font-sans-serif: 'mastodon-font-sans-serif' !default; -$font-display: 'mastodon-font-display' !default; -$font-monospace: 'mastodon-font-monospace' !default; -+$font-sans-serif: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue" !default; ++$font-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue" !default; +$font-display: $font-sans-serif !default; -+$font-monospace: ui-monospace, Menlo, Monaco, "Cascadia Mono", "Segoe UI Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New" !default; ++$font-monospace: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas, "Liberation Mono" !default;