Add latest changes from gitlab-org/gitlab@master

4 files changed, 10 insertions, 5 deletions

diff --git a/app/assets/stylesheets/components/related_items_list.scss b/app/assets/stylesheets/components/related_items_list.scss
index 04a7590d531..4d53ae9ed4b 100644
--- a/app/assets/stylesheets/components/related_items_list.scss
+++ b/app/assets/stylesheets/components/related_items_list.scss
@@ -5,7 +5,6 @@ $item-remove-button-space: 42px;
 
 .related-items-list {
   padding: $gl-padding-4;
-  padding-right: $gl-padding-6;
   border-bottom-left-radius: $gl-border-size-3;
   border-bottom-right-radius: $gl-border-size-3;
 
diff --git a/app/assets/stylesheets/fonts.scss b/app/assets/stylesheets/fonts.scss
index 0d87d49ac18..2f7228766b9 100644
--- a/app/assets/stylesheets/fonts.scss
+++ b/app/assets/stylesheets/fonts.scss
@@ -1,3 +1,5 @@
+$font-display: optional !default;
+
 /* -------------------------------------------------------
 Inter variable font.
 
@@ -7,7 +9,7 @@ Usage:
 @font-face {
   font-family: 'GitLab Sans';
   font-weight: 100 900;
-  font-display: optional;
+  font-display: $font-display;
   font-style: normal;
   /* stylelint-disable-next-line property-no-unknown */
   font-named-instance: 'Regular';
@@ -17,7 +19,7 @@ Usage:
 @font-face {
   font-family: 'GitLab Sans';
   font-weight: 100 900;
-  font-display: optional;
+  font-display: $font-display;
   font-style: italic;
   /* stylelint-disable-next-line property-no-unknown */
   font-named-instance: 'Regular';
@@ -33,7 +35,7 @@ Usage:
 @font-face {
   font-family: 'GitLab Mono';
   font-weight: 100 900;
-  font-display: optional;
+  font-display: $font-display;
   font-style: normal;
   src: font-url('gitlab-mono/GitLabMono.woff2') format('woff2');
 }
@@ -41,7 +43,7 @@ Usage:
 @font-face {
   font-family: 'GitLab Mono';
   font-weight: 100 900;
-  font-display: optional;
+  font-display: $font-display;
   font-style: italic;
   src: font-url('gitlab-mono/GitLabMono-Italic.woff2') format('woff2');
 }
diff --git a/app/assets/stylesheets/fonts_optional.scss b/app/assets/stylesheets/fonts_optional.scss
new file mode 100644
index 00000000000..2b1a3796bbc
--- /dev/null
+++ b/app/assets/stylesheets/fonts_optional.scss
@@ -0,0 +1 @@
+@import 'fonts';
diff --git a/app/assets/stylesheets/fonts_swap.scss b/app/assets/stylesheets/fonts_swap.scss
new file mode 100644
index 00000000000..b259b8ad103
--- /dev/null
+++ b/app/assets/stylesheets/fonts_swap.scss
@@ -0,0 +1,3 @@
+$font-display: swap;
+
+@import 'fonts';