jake/mastodon-utils
1
Fork 0
mirror of https://github.com/jakejarvis/mastodon-utils.git synced 2025-04-26 17:08:26 -04:00
Code Issues Releases Wiki Activity

modern system font stack

Browse Source 
https://css-tricks.com/snippets/css/system-font-stack/
This commit is contained in:
Jake Jarvis 2023-01-03 11:31:28 -05:00
parent f2aa4a039e
commit 1495d97cf7
Signed by: jake
GPG Key ID: 2B0C9CF251E69A39
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patches/glitch/system-font.patch
View File

@ -50,7 +50,7 @@ index fbb02c788..3946684ed 100644
@import 'reset'; @import 'reset';
@import 'basics'; @import 'basics';
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss 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 --- a/app/javascript/flavours/glitch/styles/variables.scss
+++ b/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%; @@ -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-sans-serif: 'mastodon-font-sans-serif' !default;
-$font-display: 'mastodon-font-display' !default; -$font-display: 'mastodon-font-display' !default;
-$font-monospace: 'mastodon-font-monospace' !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-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) // Avatar border size (8% default, 100% for rounded avatars)
$ui-avatar-border-size: 8%; $ui-avatar-border-size: 8%;

6
patches/system-font.patch
View File

@ -47,7 +47,7 @@ index 413a1cdd6..fccbf2763 100644
padding: 0; padding: 0;
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss 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 --- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss +++ b/app/javascript/styles/mastodon/variables.scss
@@ -55,6 +55,6 @@ $media-modal-media-max-height: 80%; @@ -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-sans-serif: 'mastodon-font-sans-serif' !default;
-$font-display: 'mastodon-font-display' !default; -$font-display: 'mastodon-font-display' !default;
-$font-monospace: 'mastodon-font-monospace' !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-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;