Skip to content

Commit

Permalink
Use correct local names for fonts (mastodon#10594)
Browse files Browse the repository at this point in the history
  • Loading branch information
ClearlyClaire authored and hiyuki2578 committed Oct 2, 2019
1 parent c758a84 commit 6404347
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion app/javascript/styles/fonts/montserrat.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions app/javascript/styles/fonts/roboto.scss
Original file line number Diff line number Diff line change
@@ -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'),
Expand All @@ -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'),
Expand All @@ -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'),
Expand Down

0 comments on commit 6404347

Please sign in to comment.