diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-01 12:43:20 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-01 12:43:20 +0200 |
commit | c91d9b7389c489980fe98812a8f3884b2d41e19e (patch) | |
tree | 78509567984a32411c661167e254c8645eba2919 /app/javascript/styles/mailer.scss | |
parent | 4e60a0d5433f5dfa4f71a452cc5c6ceb0f21ceab (diff) | |
parent | 5d5d1b528eda560191b2813714c9e461fda3c9d8 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb
Diffstat (limited to 'app/javascript/styles/mailer.scss')
-rw-r--r-- | app/javascript/styles/mailer.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss index dbe070f9a..d83bd4d96 100644 --- a/app/javascript/styles/mailer.scss +++ b/app/javascript/styles/mailer.scss @@ -169,7 +169,7 @@ p { font-family: Helvetica, Arial, sans-serif; @media only screen { - font-family: 'mastodon-font-sans-serif', sans-serif !important; + font-family: $font-sans-serif, sans-serif !important; } } |