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/roboto.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/roboto.scss')
| -rw-r--r-- | app/javascript/styles/fonts/roboto.scss | 6 |
1 files changed, 3 insertions, 3 deletions
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'), |