mirror of
https://github.com/jakejarvis/mastodon-utils.git
synced 2025-04-26 02:15:22 -04:00
69 lines
3.0 KiB
Diff
69 lines
3.0 KiB
Diff
diff --git a/app/javascript/flavours/glitch/styles/basics.scss b/app/javascript/flavours/glitch/styles/basics.scss
|
|
index a00b2936f..340294d73 100644
|
|
--- a/app/javascript/flavours/glitch/styles/basics.scss
|
|
+++ b/app/javascript/flavours/glitch/styles/basics.scss
|
|
@@ -18,21 +18,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/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss
|
|
index 8ba8bec10..e5db3303f 100644
|
|
--- a/app/javascript/flavours/glitch/styles/components/modal.scss
|
|
+++ b/app/javascript/flavours/glitch/styles/components/modal.scss
|
|
@@ -1131,7 +1131,7 @@
|
|
width: 100%;
|
|
border: 0;
|
|
padding: 10px;
|
|
- font-family: 'mastodon-font-monospace', monospace;
|
|
+ font-family: $font-monospace, monospace;
|
|
background: $ui-base-color;
|
|
color: $primary-text-color;
|
|
font-size: 14px;
|
|
diff --git a/app/javascript/flavours/glitch/styles/index.scss b/app/javascript/flavours/glitch/styles/index.scss
|
|
index fbb02c788..3946684ed 100644
|
|
--- a/app/javascript/flavours/glitch/styles/index.scss
|
|
+++ b/app/javascript/flavours/glitch/styles/index.scss
|
|
@@ -1,7 +1,5 @@
|
|
@import 'mixins';
|
|
@import 'variables';
|
|
-@import 'styles/fonts/roboto';
|
|
-@import 'styles/fonts/roboto-mono';
|
|
|
|
@import 'reset';
|
|
@import 'basics';
|
|
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss
|
|
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%;
|
|
|
|
$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: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue" !default;
|
|
+$font-display: $font-sans-serif !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%;
|