Merged r23275 from trunk to 6.0-stable (#41748).

git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23278 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/assets/fonts/NotoSans-Bold.woff2 b/app/assets/fonts/NotoSans-Bold.woff2
new file mode 100644 (file)
index 0000000..52c4899
Binary files /dev/null and b/app/assets/fonts/NotoSans-Bold.woff2 differ

diff --git a/app/assets/fonts/NotoSans-BoldItalic.woff2 b/app/assets/fonts/NotoSans-BoldItalic.woff2
new file mode 100644 (file)
index 0000000..8172d53
Binary files /dev/null and b/app/assets/fonts/NotoSans-BoldItalic.woff2 differ

diff --git a/app/assets/fonts/NotoSans-Italic-VariableFont_wdth,wght.woff2 b/app/assets/fonts/NotoSans-Italic-VariableFont_wdth,wght.woff2
deleted file mode 100644 (file)
index a7a1e51..0000000
Binary files a/app/assets/fonts/NotoSans-Italic-VariableFont_wdth,wght.woff2 and /dev/null differ

diff --git a/app/assets/fonts/NotoSans-Italic.woff2 b/app/assets/fonts/NotoSans-Italic.woff2
new file mode 100644 (file)
index 0000000..4fc5007
Binary files /dev/null and b/app/assets/fonts/NotoSans-Italic.woff2 differ

diff --git a/app/assets/fonts/NotoSans-Regular.woff2 b/app/assets/fonts/NotoSans-Regular.woff2
new file mode 100644 (file)
index 0000000..1a88667
Binary files /dev/null and b/app/assets/fonts/NotoSans-Regular.woff2 differ

diff --git a/app/assets/fonts/NotoSans-VariableFont_wdth,wght.woff2 b/app/assets/fonts/NotoSans-VariableFont_wdth,wght.woff2
deleted file mode 100644 (file)
index c9c4ebe..0000000
Binary files a/app/assets/fonts/NotoSans-VariableFont_wdth,wght.woff2 and /dev/null differ

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index fc8d32b8a893967846c4becbfb1f791b25f16327..304f32284c9f2e79820c5232b7215924f2adf9de 100644 (file)
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -6,18 +6,32 @@
 
 @font-face {
   font-family: "Noto Sans";
-  src: url("/NotoSans-VariableFont_wdth,wght.woff2") format("woff2");
-  font-weight: 100 900;
-  font-stretch: 75% 125%;
+  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%;
+  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;
 }