diff options
| author | Reverite <github@reverite.sh> | 2019-05-06 18:17:05 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-05-06 18:17:05 -0700 |
| commit | 5b85256b334b13fad26a2bc073a874750a3cdc2e (patch) | |
| tree | 2d523aa8266e42ae31ab82c7fc2533cf4a90ff0d /app/javascript/styles/fonts | |
| parent | e10a9794f4ed7c90e3190f285359f55dd00da435 (diff) | |
| parent | 89d2859296bc5a57a8db07be86239cc938a3f691 (diff) | |
Merge remote-tracking branch 'glitch/master' into production
Diffstat (limited to 'app/javascript/styles/fonts')
| -rw-r--r-- | app/javascript/styles/fonts/montserrat.scss | 2 | ||||
| -rw-r--r-- | app/javascript/styles/fonts/roboto.scss | 6 |
2 files changed, 4 insertions, 4 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; diff --git a/app/javascript/styles/fonts/roboto.scss b/app/javascript/styles/fonts/roboto.scss index 79034c018..b75fdb927 100644 --- a/app/javascript/styles/fonts/roboto.scss +++ b/app/javascript/styles/fonts/roboto.scss @@ -1,6 +1,6 @@ @font-face { font-family: 'mastodon-font-sans-serif'; - src: local('Roboto'), + src: local('Roboto Italic'), url('~fonts/roboto/roboto-italic-webfont.woff2') format('woff2'), url('~fonts/roboto/roboto-italic-webfont.woff') format('woff'), url('~fonts/roboto/roboto-italic-webfont.ttf') format('truetype'), @@ -11,7 +11,7 @@ @font-face { font-family: 'mastodon-font-sans-serif'; - src: local('Roboto'), + src: local('Roboto Bold'), url('~fonts/roboto/roboto-bold-webfont.woff2') format('woff2'), url('~fonts/roboto/roboto-bold-webfont.woff') format('woff'), url('~fonts/roboto/roboto-bold-webfont.ttf') format('truetype'), @@ -22,7 +22,7 @@ @font-face { font-family: 'mastodon-font-sans-serif'; - src: local('Roboto'), + src: local('Roboto Medium'), url('~fonts/roboto/roboto-medium-webfont.woff2') format('woff2'), url('~fonts/roboto/roboto-medium-webfont.woff') format('woff'), url('~fonts/roboto/roboto-medium-webfont.ttf') format('truetype'), |