diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-08-14 15:26:10 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-08-30 05:45:17 -0500 |
| commit | d6f351aabeec302035c3c0c4f2c8ef5550d56451 (patch) | |
| tree | 115f5ee3dc0f8235491dbb64b715dc40199ee2d5 /app/javascript/flavours/glitch | |
| parent | be2f755c26db02c90a37d738f2786ff2355f5901 (diff) | |
[UI] Make it possible for display fonts to be changed
Diffstat (limited to 'app/javascript/flavours/glitch')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/components/modal.scss | 2 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/index.scss | 2 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/variables.scss | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss index d0be730ac..f80045505 100644 --- a/app/javascript/flavours/glitch/styles/components/modal.scss +++ b/app/javascript/flavours/glitch/styles/components/modal.scss @@ -847,7 +847,7 @@ width: 100%; border: none; padding: 10px; - font-family: 'mastodon-font-monospace', monospace; + font-family: 'roboto-mono', 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 6e87d7656..c1ed4a6f1 100644 --- a/app/javascript/flavours/glitch/styles/index.scss +++ b/app/javascript/flavours/glitch/styles/index.scss @@ -1,6 +1,6 @@ @import 'mixins'; @import 'variables'; -//@import 'styles/fonts/roboto'; +@import 'styles/fonts/roboto'; @import 'styles/fonts/opensans'; @import 'styles/fonts/roboto-mono'; @import 'styles/fonts/montserrat'; diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss index 1ed1a5778..8d1d394f5 100644 --- a/app/javascript/flavours/glitch/styles/variables.scss +++ b/app/javascript/flavours/glitch/styles/variables.scss @@ -51,9 +51,9 @@ $media-modal-media-max-height: 80%; $no-gap-breakpoint: 415px; -$font-sans-serif: 'mastodon-font-sans-serif' !default; -$font-display: 'mastodon-font-display' !default; -$font-monospace: 'mastodon-font-monospace' !default; +$font-sans-serif: 'opensans' !default; +$font-display: 'montserrat' !default; +$font-monospace: 'roboto-mono' !default; // Avatar border size (8% default, 100% for rounded avatars) $ui-avatar-border-size: 8%; |