mirror of
https://github.com/jakejarvis/mastodon-utils.git
synced 2025-04-26 06:45:22 -04:00
63 lines
2.6 KiB
Diff
63 lines
2.6 KiB
Diff
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
|
|
index 81a040108..01c840180 100644
|
|
--- a/app/javascript/styles/application.scss
|
|
+++ b/app/javascript/styles/application.scss
|
|
@@ -1,7 +1,5 @@
|
|
@import 'mastodon/mixins';
|
|
@import 'mastodon/variables';
|
|
-@import 'fonts/roboto';
|
|
-@import 'fonts/roboto-mono';
|
|
|
|
@import 'mastodon/reset';
|
|
@import 'mastodon/basics';
|
|
diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
|
|
index 18fe522eb..16ffb8b2f 100644
|
|
--- a/app/javascript/styles/mailer.scss
|
|
+++ b/app/javascript/styles/mailer.scss
|
|
@@ -1,5 +1,4 @@
|
|
@import 'mastodon/variables';
|
|
-@import 'fonts/roboto';
|
|
|
|
table,
|
|
td,
|
|
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
|
|
index 413a1cdd6..fccbf2763 100644
|
|
--- a/app/javascript/styles/mastodon/basics.scss
|
|
+++ b/app/javascript/styles/mastodon/basics.scss
|
|
@@ -19,21 +19,6 @@ body {
|
|
-webkit-tap-highlight-color: rgba(0, 0, 0, 0%);
|
|
-webkit-tap-highlight-color: transparent;
|
|
|
|
- &.system-font {
|
|
- // system-ui => standard property (Chrome/Android WebView 56+, Opera 43+, Safari 11+)
|
|
- // -apple-system => Safari <11 specific
|
|
- // BlinkMacSystemFont => Chrome <56 on macOS specific
|
|
- // Segoe UI => Windows 7/8/10
|
|
- // Oxygen => KDE
|
|
- // Ubuntu => Unity/Ubuntu
|
|
- // Cantarell => GNOME
|
|
- // Fira Sans => Firefox OS
|
|
- // Droid Sans => Older Androids (<4.0)
|
|
- // Helvetica Neue => Older macOS <10.11
|
|
- // $font-sans-serif => web-font (Roboto) fallback and newer Androids (>=4.0)
|
|
- font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", $font-sans-serif, sans-serif;
|
|
- }
|
|
-
|
|
&.app-body {
|
|
padding: 0;
|
|
|
|
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
|
|
index 2f6c41d5f..b968ea42d 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%;
|
|
|
|
$no-gap-breakpoint: 1175px;
|
|
|
|
-$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-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;
|