about summary refs log tree commit diff
path: root/app/javascript/styles/mastodon/basics.scss
diff options
context:
space:
mode:
authorMinku Lee <premist@me.com>2018-09-24 03:41:24 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-09-23 20:41:24 +0200
commitd0d65b5a2899546c4134d1fca60aef2c23c4932d (patch)
tree27511f6ba4019289269d4aaaa3dfee2c96e6d74f /app/javascript/styles/mastodon/basics.scss
parentef1134728145c6dcf094e7a0a16a8d63f70aed6c (diff)
Separate font-family into variable (#8763)
This will allow easier customization of font family instead of going
through all occurrences of 'mastodon-font-sans-serif'.
Diffstat (limited to 'app/javascript/styles/mastodon/basics.scss')
-rw-r--r--app/javascript/styles/mastodon/basics.scss6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
index 3bbb31e6e..746def625 100644
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@@ -6,7 +6,7 @@
 }
 
 body {
-  font-family: 'mastodon-font-sans-serif', sans-serif;
+  font-family: $font-sans-serif, sans-serif;
   background: darken($ui-base-color, 8%);
   font-size: 13px;
   line-height: 18px;
@@ -29,8 +29,8 @@ body {
     // Fira Sans => Firefox OS
     // Droid Sans => Older Androids (<4.0)
     // Helvetica Neue => Older macOS <10.11
-    // mastodon-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", mastodon-font-sans-serif, sans-serif;
+    // $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 {