diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-07-12 02:03:17 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-07-12 02:03:17 -0700 |
| commit | 79d898ae0ad8c0e66bd63ec3e0904e9e5e7894e8 (patch) | |
| tree | ee8d832ed2f11e9afe62daf0e586a86004eb8d98 /app/javascript/styles/fonts/montserrat.scss | |
| parent | bcf7ee48e94cd2e4d2de28e8854e7f0e2b5cad1f (diff) | |
| parent | 056b5ed72f6d980bceeb49eb249b8365fe8fce66 (diff) | |
Merge upstream!! #64 <3 <3
Diffstat (limited to 'app/javascript/styles/fonts/montserrat.scss')
| -rw-r--r-- | app/javascript/styles/fonts/montserrat.scss | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/javascript/styles/fonts/montserrat.scss b/app/javascript/styles/fonts/montserrat.scss index e4012ab02..206f1865e 100644 --- a/app/javascript/styles/fonts/montserrat.scss +++ b/app/javascript/styles/fonts/montserrat.scss @@ -7,3 +7,11 @@ font-weight: 400; font-style: normal; } + +@font-face { + font-family: 'mastodon-font-display'; + src: local('Montserrat'), + url('../fonts/montserrat/Montserrat-Medium.ttf') format('truetype'); + font-weight: 500; + font-style: normal; +} |