fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-24 01:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add font-display to display text before loading (#16330)

Browse source
This commit is contained in:
Jeong Arm 2021-10-15 04:04:26 +09:00 committed by GitHub
parent 8ce42640e5
commit 3ec8e04b3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/styles/fonts/montserrat.scss
View file

@ -5,6 +5,7 @@
url('../fonts/montserrat/Montserrat-Regular.woff') format('woff'), url('../fonts/montserrat/Montserrat-Regular.woff') format('woff'),
url('../fonts/montserrat/Montserrat-Regular.ttf') format('truetype'); url('../fonts/montserrat/Montserrat-Regular.ttf') format('truetype');
font-weight: 400; font-weight: 400;
font-display: swap;
font-style: normal; font-style: normal;
} }
@ -13,5 +14,6 @@
src: local('Montserrat Medium'), src: local('Montserrat Medium'),
url('../fonts/montserrat/Montserrat-Medium.ttf') format('truetype'); url('../fonts/montserrat/Montserrat-Medium.ttf') format('truetype');
font-weight: 500; font-weight: 500;
font-display: swap;
font-style: normal; font-style: normal;
} }

1
app/javascript/styles/fonts/roboto-mono.scss
View file

@ -6,5 +6,6 @@
url('../fonts/roboto-mono/robotomono-regular-webfont.ttf') format('truetype'), url('../fonts/roboto-mono/robotomono-regular-webfont.ttf') format('truetype'),
url('../fonts/roboto-mono/robotomono-regular-webfont.svg#roboto_monoregular') format('svg'); url('../fonts/roboto-mono/robotomono-regular-webfont.svg#roboto_monoregular') format('svg');
font-weight: 400; font-weight: 400;
font-display: swap;
font-style: normal; font-style: normal;
} }

4
app/javascript/styles/fonts/roboto.scss
View file

@ -6,6 +6,7 @@
url('../fonts/roboto/roboto-italic-webfont.ttf') format('truetype'), url('../fonts/roboto/roboto-italic-webfont.ttf') format('truetype'),
url('../fonts/roboto/roboto-italic-webfont.svg#roboto-italic-webfont') format('svg'); url('../fonts/roboto/roboto-italic-webfont.svg#roboto-italic-webfont') format('svg');
font-weight: normal; font-weight: normal;
font-display: swap;
font-style: italic; font-style: italic;
} }
@ -17,6 +18,7 @@
url('../fonts/roboto/roboto-bold-webfont.ttf') format('truetype'), url('../fonts/roboto/roboto-bold-webfont.ttf') format('truetype'),
url('../fonts/roboto/roboto-bold-webfont.svg#roboto-bold-webfont') format('svg'); url('../fonts/roboto/roboto-bold-webfont.svg#roboto-bold-webfont') format('svg');
font-weight: bold; font-weight: bold;
font-display: swap;
font-style: normal; font-style: normal;
} }
@ -28,6 +30,7 @@
url('../fonts/roboto/roboto-medium-webfont.ttf') format('truetype'), url('../fonts/roboto/roboto-medium-webfont.ttf') format('truetype'),
url('../fonts/roboto/roboto-medium-webfont.svg#roboto-medium-webfont') format('svg'); url('../fonts/roboto/roboto-medium-webfont.svg#roboto-medium-webfont') format('svg');
font-weight: 500; font-weight: 500;
font-display: swap;
font-style: normal; font-style: normal;
} }
@ -39,5 +42,6 @@
url('../fonts/roboto/roboto-regular-webfont.ttf') format('truetype'), url('../fonts/roboto/roboto-regular-webfont.ttf') format('truetype'),
url('../fonts/roboto/roboto-regular-webfont.svg#roboto-regular-webfont') format('svg'); url('../fonts/roboto/roboto-regular-webfont.svg#roboto-regular-webfont') format('svg');
font-weight: normal; font-weight: normal;
font-display: swap;
font-style: normal; font-style: normal;
} }