From 1c690812495613beff8a48ef4b1a544eb0688021 Mon Sep 17 00:00:00 2001 From: simurai Date: Thu, 22 Dec 2022 16:17:18 +0900 Subject: [PATCH 1/5] Add `Noto Sans` to fontStack --- src/theme-preval.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/theme-preval.js b/src/theme-preval.js index 8951e6a0f62..6418fd29cdd 100644 --- a/src/theme-preval.js +++ b/src/theme-preval.js @@ -18,6 +18,7 @@ const fonts = { '-apple-system', 'BlinkMacSystemFont', 'Segoe UI', + 'Noto Sans', 'Helvetica', 'Arial', 'sans-serif', From 820fdda3bbc087fb7d132fe8260ead9e48b85394 Mon Sep 17 00:00:00 2001 From: simurai Date: Thu, 22 Dec 2022 16:27:50 +0900 Subject: [PATCH 2/5] Create ninety-bobcats-worry.md --- .changeset/ninety-bobcats-worry.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/ninety-bobcats-worry.md diff --git a/.changeset/ninety-bobcats-worry.md b/.changeset/ninety-bobcats-worry.md new file mode 100644 index 00000000000..c3b604f97df --- /dev/null +++ b/.changeset/ninety-bobcats-worry.md @@ -0,0 +1,5 @@ +--- +"@primer/react": patch +--- + +Add `Noto Sans` to fontStack From d3a03ab8a4c25206b691490dbea11c81c9ead3e1 Mon Sep 17 00:00:00 2001 From: Cole Bemis Date: Thu, 22 Dec 2022 17:37:03 +0000 Subject: [PATCH 3/5] Update snapshots --- src/__tests__/__snapshots__/ActionMenu.test.tsx.snap | 2 +- src/__tests__/__snapshots__/AnchoredOverlay.test.tsx.snap | 4 ++-- src/__tests__/__snapshots__/ConfirmationDialog.test.tsx.snap | 2 +- src/__tests__/__snapshots__/TextInput.test.tsx.snap | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/__tests__/__snapshots__/ActionMenu.test.tsx.snap b/src/__tests__/__snapshots__/ActionMenu.test.tsx.snap index 5180029992f..8fe3eb22637 100644 --- a/src/__tests__/__snapshots__/ActionMenu.test.tsx.snap +++ b/src/__tests__/__snapshots__/ActionMenu.test.tsx.snap @@ -2,7 +2,7 @@ exports[`ActionMenu renders consistently 1`] = ` .c0 { - font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"; + font-family: -apple-system,BlinkMacSystemFont,"Segoe UI","Noto Sans",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"; line-height: 1.5; color: #24292f; } diff --git a/src/__tests__/__snapshots__/AnchoredOverlay.test.tsx.snap b/src/__tests__/__snapshots__/AnchoredOverlay.test.tsx.snap index e89b2ec305b..ccffa219b5c 100644 --- a/src/__tests__/__snapshots__/AnchoredOverlay.test.tsx.snap +++ b/src/__tests__/__snapshots__/AnchoredOverlay.test.tsx.snap @@ -2,7 +2,7 @@ exports[`AnchoredOverlay renders consistently 1`] = ` .c0 { - font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"; + font-family: -apple-system,BlinkMacSystemFont,"Segoe UI","Noto Sans",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"; line-height: 1.5; color: #24292f; } @@ -93,7 +93,7 @@ exports[`AnchoredOverlay renders consistently 1`] = ` exports[`AnchoredOverlay should render consistently when open 1`] = ` .c0 { - font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"; + font-family: -apple-system,BlinkMacSystemFont,"Segoe UI","Noto Sans",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"; line-height: 1.5; color: #24292f; } diff --git a/src/__tests__/__snapshots__/ConfirmationDialog.test.tsx.snap b/src/__tests__/__snapshots__/ConfirmationDialog.test.tsx.snap index d96fda689eb..c6422f2669f 100644 --- a/src/__tests__/__snapshots__/ConfirmationDialog.test.tsx.snap +++ b/src/__tests__/__snapshots__/ConfirmationDialog.test.tsx.snap @@ -2,7 +2,7 @@ exports[`ConfirmationDialog renders consistently 1`] = ` .c0 { - font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"; + font-family: -apple-system,BlinkMacSystemFont,"Segoe UI","Noto Sans",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"; line-height: 1.5; color: #24292f; } diff --git a/src/__tests__/__snapshots__/TextInput.test.tsx.snap b/src/__tests__/__snapshots__/TextInput.test.tsx.snap index 4b72e6ebeb5..93fd4df7d05 100644 --- a/src/__tests__/__snapshots__/TextInput.test.tsx.snap +++ b/src/__tests__/__snapshots__/TextInput.test.tsx.snap @@ -1546,7 +1546,7 @@ exports[`TextInput renders trailingAction icon button 1`] = ` z-index: 1000000; display: none; padding: 0.5em 0.75em; - font: normal normal 11px/1.5 -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"; + font: normal normal 11px/1.5 -apple-system,BlinkMacSystemFont,"Segoe UI","Noto Sans",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"; -webkit-font-smoothing: subpixel-antialiased; color: #ffffff; text-align: center; @@ -2562,7 +2562,7 @@ exports[`TextInput renders trailingAction text button with a tooltip 1`] = ` z-index: 1000000; display: none; padding: 0.5em 0.75em; - font: normal normal 11px/1.5 -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"; + font: normal normal 11px/1.5 -apple-system,BlinkMacSystemFont,"Segoe UI","Noto Sans",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"; -webkit-font-smoothing: subpixel-antialiased; color: #ffffff; text-align: center; From 7e624c092cba68ad039752194696bddaa4cbdd5e Mon Sep 17 00:00:00 2001 From: simurai Date: Mon, 26 Dec 2022 02:52:07 +0000 Subject: [PATCH 4/5] Update more snapshots --- src/__tests__/__snapshots__/SelectPanel.test.tsx.snap | 2 +- src/__tests__/__snapshots__/Tooltip.test.tsx.snap | 2 +- src/__tests__/__snapshots__/themePreval.test.ts.snap | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/__tests__/__snapshots__/SelectPanel.test.tsx.snap b/src/__tests__/__snapshots__/SelectPanel.test.tsx.snap index 98eddf34cfb..308f2270ac6 100644 --- a/src/__tests__/__snapshots__/SelectPanel.test.tsx.snap +++ b/src/__tests__/__snapshots__/SelectPanel.test.tsx.snap @@ -2,7 +2,7 @@ exports[`SelectPanel renders consistently 1`] = ` .c0 { - font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"; + font-family: -apple-system,BlinkMacSystemFont,"Segoe UI","Noto Sans",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"; line-height: 1.5; color: #24292f; } diff --git a/src/__tests__/__snapshots__/Tooltip.test.tsx.snap b/src/__tests__/__snapshots__/Tooltip.test.tsx.snap index 25e5a7b14ab..06951fbbcc0 100644 --- a/src/__tests__/__snapshots__/Tooltip.test.tsx.snap +++ b/src/__tests__/__snapshots__/Tooltip.test.tsx.snap @@ -23,7 +23,7 @@ exports[`Tooltip renders consistently 1`] = ` z-index: 1000000; display: none; padding: 0.5em 0.75em; - font: normal normal 11px/1.5 -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"; + font: normal normal 11px/1.5 -apple-system,BlinkMacSystemFont,"Segoe UI","Noto Sans",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"; -webkit-font-smoothing: subpixel-antialiased; color: #ffffff; text-align: center; diff --git a/src/__tests__/__snapshots__/themePreval.test.ts.snap b/src/__tests__/__snapshots__/themePreval.test.ts.snap index 5791a4d2709..dd0d459d5d8 100644 --- a/src/__tests__/__snapshots__/themePreval.test.ts.snap +++ b/src/__tests__/__snapshots__/themePreval.test.ts.snap @@ -13,7 +13,7 @@ var themePreval = { "borderWidths": [0, "1px"], "breakpoints": ["544px", "768px", "1012px", "1280px"], "fonts": { - "normal": "-apple-system, BlinkMacSystemFont, \\"Segoe UI\\", Helvetica, Arial, sans-serif, \\"Apple Color Emoji\\", \\"Segoe UI Emoji\\"", + "normal": "-apple-system, BlinkMacSystemFont, \\"Segoe UI\\", \"Noto Sans\", Helvetica, Arial, sans-serif, \\"Apple Color Emoji\\", \\"Segoe UI Emoji\\"", "mono": "SFMono-Regular, Consolas, \\"Liberation Mono\\", Menlo, Courier, monospace" }, "fontSizes": ["12px", "14px", "16px", "20px", "24px", "32px", "40px", "48px"], From 19a27c0782fda96e99313120fc498aca4178b370 Mon Sep 17 00:00:00 2001 From: simurai Date: Mon, 26 Dec 2022 03:02:24 +0000 Subject: [PATCH 5/5] Escape --- src/__tests__/__snapshots__/themePreval.test.ts.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/__tests__/__snapshots__/themePreval.test.ts.snap b/src/__tests__/__snapshots__/themePreval.test.ts.snap index dd0d459d5d8..4734fd20d36 100644 --- a/src/__tests__/__snapshots__/themePreval.test.ts.snap +++ b/src/__tests__/__snapshots__/themePreval.test.ts.snap @@ -13,7 +13,7 @@ var themePreval = { "borderWidths": [0, "1px"], "breakpoints": ["544px", "768px", "1012px", "1280px"], "fonts": { - "normal": "-apple-system, BlinkMacSystemFont, \\"Segoe UI\\", \"Noto Sans\", Helvetica, Arial, sans-serif, \\"Apple Color Emoji\\", \\"Segoe UI Emoji\\"", + "normal": "-apple-system, BlinkMacSystemFont, \\"Segoe UI\\", \\"Noto Sans\\", Helvetica, Arial, sans-serif, \\"Apple Color Emoji\\", \\"Segoe UI Emoji\\"", "mono": "SFMono-Regular, Consolas, \\"Liberation Mono\\", Menlo, Courier, monospace" }, "fontSizes": ["12px", "14px", "16px", "20px", "24px", "32px", "40px", "48px"],