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/montserrat.scss | |
parent | bd872c93333b90f85d90bc60f5690537bee15ee2 (diff) | |
parent | 3d841eba69b340aac4f012fb388f9e9761ec2ba5 (diff) |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/javascript/styles/fonts/montserrat.scss')
-rw-r--r-- | app/javascript/styles/fonts/montserrat.scss | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/javascript/styles/fonts/montserrat.scss b/app/javascript/styles/fonts/montserrat.scss index 2abcb0c2b..03f67ed3f 100644 --- a/app/javascript/styles/fonts/montserrat.scss +++ b/app/javascript/styles/fonts/montserrat.scss @@ -1,6 +1,7 @@ @font-face { - font-family: 'mastodon-font-display'; - src: local('Montserrat'), + font-family: mastodon-font-display; + src: + local('Montserrat'), url('~fonts/montserrat/Montserrat-Regular.woff2') format('woff2'), url('~fonts/montserrat/Montserrat-Regular.woff') format('woff'), url('~fonts/montserrat/Montserrat-Regular.ttf') format('truetype'); @@ -10,8 +11,9 @@ } @font-face { - font-family: 'mastodon-font-display'; - src: local('Montserrat Medium'), + font-family: mastodon-font-display; + src: + local('Montserrat Medium'), url('~fonts/montserrat/Montserrat-Medium.ttf') format('truetype'); font-weight: 500; font-display: swap; |