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/containers.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/containers.scss')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/containers.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/styles/containers.scss b/app/javascript/flavours/glitch/styles/containers.scss index d1b9934d7..398458e47 100644 --- a/app/javascript/flavours/glitch/styles/containers.scss +++ b/app/javascript/flavours/glitch/styles/containers.scss @@ -37,7 +37,7 @@ outline: 0; padding: 12px 16px; line-height: 32px; - font-family: 'mastodon-font-display', sans-serif; + font-family: $font-display, sans-serif; font-weight: 500; font-size: 14px; } @@ -633,7 +633,7 @@ font-size: 18px; margin-bottom: 5px; color: $primary-text-color; - font-family: 'mastodon-font-display', sans-serif; + font-family: $font-display, sans-serif; } } |