Add latest changes from gitlab-org/gitlab@master

1 files changed, 23 insertions, 5 deletions

diff --git a/app/assets/stylesheets/fonts.scss b/app/assets/stylesheets/fonts.scss
index a023b41083d..369f7072aa4 100644
--- a/app/assets/stylesheets/fonts.scss
+++ b/app/assets/stylesheets/fonts.scss
@@ -14,8 +14,31 @@ Usage:
 }
 
 /* -------------------------------------------------------
+Monospaced font: GitLab Mono.
+
+Usage:
+  html { font-family: 'GitLab Mono', sans-serif; }
+*/
+@font-face {
+  font-family: 'GitLab Mono';
+  font-display: optional;
+  font-style: normal;
+  src: font-url('gitlab-mono/GitLabMono.woff2') format('woff2');
+}
+
+@font-face {
+  font-family: 'GitLab Mono';
+  font-display: optional;
+  font-style: italic;
+  src: font-url('gitlab-mono/GitLabMono-Italic.woff2') format('woff2');
+}
+
+/* -------------------------------------------------------
 Monospaced font: JetBrains Mono.
 
+All of the definitions below can be removed once
+`GitLab Mono` is properly rolled out.
+
 Usage:
   html { font-family: 'JetBrains Mono', sans-serif; }
 */
@@ -49,11 +72,6 @@ Usage:
   src: font-url('jetbrains-mono/JetBrainsMono-BoldItalic.woff2') format('woff2');
 }
 
-:root {
-  --default-mono-font: 'JetBrains Mono', 'Menlo';
-  --default-regular-font: 'GitLab Sans', -apple-system;
-}
-
 // This isn't the best solution, but we needed a quick fix
 // https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107592/
 * {