From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 14 Oct 2021 20:14:26 +0000 (+0200)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b2eaf5562dd8378a7c83cc544885ea475d44f912;p=mastodon.git

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

Conflicts:
- `README.md`:
  Upstream added some documentation in the README, but our README is pretty
  different and barebone.
  Kept our README.
---

b2eaf5562dd8378a7c83cc544885ea475d44f912
diff --cc app/javascript/styles/fonts/montserrat.scss
index 80c2329b0,ea7e04536..2abcb0c2b
--- a/app/javascript/styles/fonts/montserrat.scss
+++ b/app/javascript/styles/fonts/montserrat.scss
@@@ -1,17 -1,19 +1,19 @@@
  @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');
 +    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');
 +    url('~fonts/montserrat/Montserrat-Medium.ttf') format('truetype');
    font-weight: 500;
+   font-display: swap;
    font-style: normal;
  }
diff --cc app/javascript/styles/fonts/roboto-mono.scss
index c793aa6ed,bd9839abf..a9513dcce
--- a/app/javascript/styles/fonts/roboto-mono.scss
+++ b/app/javascript/styles/fonts/roboto-mono.scss
@@@ -1,10 -1,11 +1,11 @@@
  @font-face {
    font-family: 'mastodon-font-monospace';
    src: local('Roboto Mono'),
 -    url('../fonts/roboto-mono/robotomono-regular-webfont.woff2') format('woff2'),
 -    url('../fonts/roboto-mono/robotomono-regular-webfont.woff') format('woff'),
 -    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.woff2') format('woff2'),
 +    url('~fonts/roboto-mono/robotomono-regular-webfont.woff') format('woff'),
 +    url('~fonts/roboto-mono/robotomono-regular-webfont.ttf') format('truetype'),
 +    url('~fonts/roboto-mono/robotomono-regular-webfont.svg#roboto_monoregular') format('svg');
    font-weight: 400;
+   font-display: swap;
    font-style: normal;
  }
diff --cc app/javascript/styles/fonts/roboto.scss
index b75fdb927,f3a6dcb6e..817b448c1
--- a/app/javascript/styles/fonts/roboto.scss
+++ b/app/javascript/styles/fonts/roboto.scss
@@@ -1,43 -1,47 +1,47 @@@
  @font-face {
    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'),
 -    url('../fonts/roboto/roboto-italic-webfont.svg#roboto-italic-webfont') format('svg');
 +    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'),
 +    url('~fonts/roboto/roboto-italic-webfont.svg#roboto-italic-webfont') format('svg');
    font-weight: normal;
+   font-display: swap;
    font-style: italic;
  }
  
  @font-face {
    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'),
 -    url('../fonts/roboto/roboto-bold-webfont.svg#roboto-bold-webfont') format('svg');
 +    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'),
 +    url('~fonts/roboto/roboto-bold-webfont.svg#roboto-bold-webfont') format('svg');
    font-weight: bold;
+   font-display: swap;
    font-style: normal;
  }
  
  @font-face {
    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'),
 -    url('../fonts/roboto/roboto-medium-webfont.svg#roboto-medium-webfont') format('svg');
 +    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'),
 +    url('~fonts/roboto/roboto-medium-webfont.svg#roboto-medium-webfont') format('svg');
    font-weight: 500;
+   font-display: swap;
    font-style: normal;
  }
  
  @font-face {
    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'),
 -    url('../fonts/roboto/roboto-regular-webfont.svg#roboto-regular-webfont') format('svg');
 +    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'),
 +    url('~fonts/roboto/roboto-regular-webfont.svg#roboto-regular-webfont') format('svg');
    font-weight: normal;
+   font-display: swap;
    font-style: normal;
  }