tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire committed 2022-10-28 19:23:58 +02:00
2 parents 371563b0e2 8dfe5179ee
commit cb19be67d1
567 files changed
+14361 -20828
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/javascript/styles/fonts/montserrat.scss
-21
View File
@@ -1,21 +0,0 @@
@font-face {
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');
font-weight: 400;
font-display: swap;
font-style: normal;
}
@font-face {
font-family: mastodon-font-display;
src:
local('Montserrat Medium'),
url('~fonts/montserrat/Montserrat-Medium.ttf') format('truetype');
font-weight: 500;
font-display: swap;
font-style: normal;
}