diff options
author | ThibG <thib@sitedethib.com> | 2018-10-02 12:01:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-02 12:01:40 +0200 |
commit | 35e9d099b3febd75d1613dfc8a494e769a98c3a6 (patch) | |
tree | 2aceaee757bd292e3d05811673a7bfe419e7b064 /app/javascript/flavours/glitch/styles/basics.scss | |
parent | 4e60a0d5433f5dfa4f71a452cc5c6ceb0f21ceab (diff) | |
parent | 6ad76069096005d7b55d9c63a567f843997a8068 (diff) |
Merge pull request #758 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/styles/basics.scss')
-rw-r--r-- | app/javascript/flavours/glitch/styles/basics.scss | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/styles/basics.scss b/app/javascript/flavours/glitch/styles/basics.scss index 9c2499ac4..550b7fdfc 100644 --- a/app/javascript/flavours/glitch/styles/basics.scss +++ b/app/javascript/flavours/glitch/styles/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 { |