diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-06-03 10:26:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-03 10:26:09 +0200 |
| commit | d2f5760ceb12ade0134be5a5fe96e677c5e6c925 (patch) | |
| tree | 64164086531e2fc9a4a4abb355add786ba79f3af /app/javascript/styles/fonts/montserrat.scss | |
| parent | c1d0a6a7981b5fe74bdd03c958a558096ea3cde8 (diff) | |
| parent | 7bf37551c8ee55d05a5dbca23db2cae7bb572789 (diff) | |
Merge pull request #1793 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/styles/fonts/montserrat.scss')
| -rw-r--r-- | app/javascript/styles/fonts/montserrat.scss | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/javascript/styles/fonts/montserrat.scss b/app/javascript/styles/fonts/montserrat.scss index 2abcb0c2b..03f67ed3f 100644 --- a/app/javascript/styles/fonts/montserrat.scss +++ b/app/javascript/styles/fonts/montserrat.scss @@ -1,6 +1,7 @@ @font-face { - font-family: 'mastodon-font-display'; - src: local('Montserrat'), + font-family: mastodon-font-display; + src: + local('Montserrat'), url('~fonts/montserrat/Montserrat-Regular.woff2') format('woff2'), url('~fonts/montserrat/Montserrat-Regular.woff') format('woff'), url('~fonts/montserrat/Montserrat-Regular.ttf') format('truetype'); @@ -10,8 +11,9 @@ } @font-face { - font-family: 'mastodon-font-display'; - src: local('Montserrat Medium'), + font-family: mastodon-font-display; + src: + local('Montserrat Medium'), url('~fonts/montserrat/Montserrat-Medium.ttf') format('truetype'); font-weight: 500; font-display: swap; |