From d3d4adf2fed1436d07db6bc5d216e297773a2b65 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Fri, 2 May 2025 07:44:54 +0000
Subject: [PATCH] Merged r23729 from trunk to 6.0-stable (#42644).

git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23735 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/assets/stylesheets/wiki_syntax.css        | 38 +++++++++++++------
 .../stylesheets/wiki_syntax_detailed.css      | 38 +++++++++++++------
 2 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/app/assets/stylesheets/wiki_syntax.css b/app/assets/stylesheets/wiki_syntax.css
index d326a3293..41e780c75 100644
--- a/app/assets/stylesheets/wiki_syntax.css
+++ b/app/assets/stylesheets/wiki_syntax.css
@@ -1,19 +1,33 @@
 @font-face {
-    font-family: "Noto Sans";
-    src: url("/NotoSans-VariableFont_wdth,wght.woff2") format("woff2");
-    font-weight: 100 900;
-    font-stretch: 75% 125%;
-    font-style: normal;
-    font-display: swap;
+  font-family: "Noto Sans";
+  src: url("/NotoSans-Regular.woff2") format("woff2");
+  font-weight: 400;
+  font-style: normal;
+  font-display: swap;
 }
 
 @font-face {
-    font-family: "Noto Sans";
-    src: url("/NotoSans-Italic-VariableFont_wdth,wght.woff2") format("woff2");
-    font-weight: 100 900;
-    font-stretch: 75% 125%;
-    font-style: italic;
-    font-display: swap;
+  font-family: "Noto Sans";
+  src: url("/NotoSans-Bold.woff2") format("woff2");
+  font-weight: 700;
+  font-style: normal;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: "Noto Sans";
+  src: url("/NotoSans-Italic.woff2") format("woff2");
+  font-weight: 400;
+  font-style: italic;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: "Noto Sans";
+  src: url("/NotoSans-BoldItalic.woff2") format("woff2");
+  font-weight: 700;
+  font-style: italic;
+  font-display: swap;
 }
 
 :root {
diff --git a/app/assets/stylesheets/wiki_syntax_detailed.css b/app/assets/stylesheets/wiki_syntax_detailed.css
index 7d7c30f53..e90279641 100644
--- a/app/assets/stylesheets/wiki_syntax_detailed.css
+++ b/app/assets/stylesheets/wiki_syntax_detailed.css
@@ -1,19 +1,33 @@
 @font-face {
-    font-family: "Noto Sans";
-    src: url("/NotoSans-VariableFont_wdth,wght.woff2") format("woff2");
-    font-weight: 100 900;
-    font-stretch: 75% 125%;
-    font-style: normal;
-    font-display: swap;
+  font-family: "Noto Sans";
+  src: url("/NotoSans-Regular.woff2") format("woff2");
+  font-weight: 400;
+  font-style: normal;
+  font-display: swap;
 }
 
 @font-face {
-    font-family: "Noto Sans";
-    src: url("/NotoSans-Italic-VariableFont_wdth,wght.woff2") format("woff2");
-    font-weight: 100 900;
-    font-stretch: 75% 125%;
-    font-style: italic;
-    font-display: swap;
+  font-family: "Noto Sans";
+  src: url("/NotoSans-Bold.woff2") format("woff2");
+  font-weight: 700;
+  font-style: normal;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: "Noto Sans";
+  src: url("/NotoSans-Italic.woff2") format("woff2");
+  font-weight: 400;
+  font-style: italic;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: "Noto Sans";
+  src: url("/NotoSans-BoldItalic.woff2") format("woff2");
+  font-weight: 700;
+  font-style: italic;
+  font-display: swap;
 }
 
 :root {