diff options
author | Starfall <us@starfall.systems> | 2022-06-06 14:06:41 -0500 |
---|---|---|
committer | Starfall <us@starfall.systems> | 2022-06-06 14:06:41 -0500 |
commit | 6e1ebaca0d241d3e9047382e47d7b7136bc4d404 (patch) | |
tree | 4257f127bd9f10897182914602b31b1ecef401f7 /app/javascript/styles/fonts/roboto.scss | |
parent | bd872c93333b90f85d90bc60f5690537bee15ee2 (diff) | |
parent | 3d841eba69b340aac4f012fb388f9e9761ec2ba5 (diff) |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/javascript/styles/fonts/roboto.scss')
-rw-r--r-- | app/javascript/styles/fonts/roboto.scss | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/app/javascript/styles/fonts/roboto.scss b/app/javascript/styles/fonts/roboto.scss index 817b448c1..0ccc43094 100644 --- a/app/javascript/styles/fonts/roboto.scss +++ b/app/javascript/styles/fonts/roboto.scss @@ -1,6 +1,7 @@ @font-face { - font-family: 'mastodon-font-sans-serif'; - src: local('Roboto Italic'), + font-family: mastodon-font-sans-serif; + 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,8 +12,9 @@ } @font-face { - font-family: 'mastodon-font-sans-serif'; - src: local('Roboto Bold'), + font-family: mastodon-font-sans-serif; + 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'), @@ -23,8 +25,9 @@ } @font-face { - font-family: 'mastodon-font-sans-serif'; - src: local('Roboto Medium'), + font-family: mastodon-font-sans-serif; + 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'), @@ -35,8 +38,9 @@ } @font-face { - font-family: 'mastodon-font-sans-serif'; - src: local('Roboto'), + font-family: mastodon-font-sans-serif; + src: + local('Roboto'), url('~fonts/roboto/roboto-regular-webfont.woff2') format('woff2'), url('~fonts/roboto/roboto-regular-webfont.woff') format('woff'), url('~fonts/roboto/roboto-regular-webfont.ttf') format('truetype'), |