diff options
| author | ThibG <thib@sitedethib.com> | 2019-04-22 23:06:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-22 23:06:54 +0200 |
| commit | 91a74ea86bb0c5b0016012ad50231956ff26592c (patch) | |
| tree | ede17b03acf207674fdf2d535a4ca05a5ed69986 /app/javascript/styles/fonts/montserrat.scss | |
| parent | c3fa4e8e07e5bcc685163959833a989fb15e8029 (diff) | |
| parent | 039e35560c04e4af1bb35b8ab11b9e145c8a4985 (diff) | |
Merge pull request #1002 from ThibG/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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/styles/fonts/montserrat.scss b/app/javascript/styles/fonts/montserrat.scss index 3d2b5a93f..80c2329b0 100644 --- a/app/javascript/styles/fonts/montserrat.scss +++ b/app/javascript/styles/fonts/montserrat.scss @@ -10,7 +10,7 @@ @font-face { font-family: 'mastodon-font-display'; - src: local('Montserrat'), + src: local('Montserrat Medium'), url('~fonts/montserrat/Montserrat-Medium.ttf') format('truetype'); font-weight: 500; font-style: normal; |