From 23488a5284afff5cf5c98aed7a50375ccbe07b7f Mon Sep 17 00:00:00 2001 From: Michael Arestad Date: Tue, 9 May 2023 10:27:34 -0600 Subject: [PATCH 1/5] Update monospace font stack --- code/lib/theming/src/base.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/lib/theming/src/base.ts b/code/lib/theming/src/base.ts index 03157875c857..56a0e0cbe2ba 100644 --- a/code/lib/theming/src/base.ts +++ b/code/lib/theming/src/base.ts @@ -72,6 +72,9 @@ export const typography = { 'sans-serif', ].join(', '), mono: [ + 'system-ui', + '-apple-system', + 'BlinkMacSystemFont', 'ui-monospace', 'Menlo', 'Monaco', From c49f472e3717c11f09a14f4e54d3076a0ef1c0a1 Mon Sep 17 00:00:00 2001 From: Michael Arestad Date: Tue, 9 May 2023 10:55:26 -0600 Subject: [PATCH 2/5] Fix vertical alignment on code elements in the manager --- code/ui/manager/src/containers/menu.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/code/ui/manager/src/containers/menu.tsx b/code/ui/manager/src/containers/menu.tsx index dba70ddb950c..23408c86f77a 100644 --- a/code/ui/manager/src/containers/menu.tsx +++ b/code/ui/manager/src/containers/menu.tsx @@ -30,7 +30,6 @@ const Key = styled.span(({ theme }) => ({ const KeyChild = styled.code( ({ theme }) => ` padding: 0; - vertical-align: middle; & + & { margin-left: 6px; From b097e42fd6cfe9f1629206e007c60aebccb3d7b8 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 28 Nov 2023 18:54:42 +0100 Subject: [PATCH 3/5] cleanup --- code/lib/theming/src/base.ts | 2 +- code/ui/manager/src/container/Menu.tsx | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/code/lib/theming/src/base.ts b/code/lib/theming/src/base.ts index 8d13310597cc..cd637db4f9bd 100644 --- a/code/lib/theming/src/base.ts +++ b/code/lib/theming/src/base.ts @@ -73,7 +73,7 @@ export const typography = { 'sans-serif', ].join(', '), mono: [ - 'system-ui', + 'system-ui', '-apple-system', 'BlinkMacSystemFont', 'ui-monospace', diff --git a/code/ui/manager/src/container/Menu.tsx b/code/ui/manager/src/container/Menu.tsx index 97b623da8fd4..ff41ac6bc9b9 100644 --- a/code/ui/manager/src/container/Menu.tsx +++ b/code/ui/manager/src/container/Menu.tsx @@ -27,20 +27,18 @@ const Key = styled.span(({ theme }) => ({ padding: '0 6px', })); -const KeyChild = styled.code( - ({ theme }) => ` - padding: 0; +const KeyChild = styled.code({ + padding: 0, - & + & { - margin-left: 6px; - } -` -); + '& + &': { + marginLeft: 6, + }, +}); export const Shortcut: FC<{ keys: string[] }> = ({ keys }) => ( <> - {keys.map((key, index) => ( + {keys.map((key) => ( {shortcutToHumanString([key])} ))} From d162e483ee4e606b560a7b9c5d7d22034a6779ea Mon Sep 17 00:00:00 2001 From: Michael Arestad Date: Tue, 28 Nov 2023 12:06:01 -0700 Subject: [PATCH 4/5] Update mono font stack --- code/lib/theming/src/base.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/lib/theming/src/base.ts b/code/lib/theming/src/base.ts index cd637db4f9bd..a322d46470a4 100644 --- a/code/lib/theming/src/base.ts +++ b/code/lib/theming/src/base.ts @@ -73,9 +73,6 @@ export const typography = { 'sans-serif', ].join(', '), mono: [ - 'system-ui', - '-apple-system', - 'BlinkMacSystemFont', 'ui-monospace', 'Menlo', 'Monaco', From f364351aef558512c15d0034614bd32edf350788 Mon Sep 17 00:00:00 2001 From: Michael Arestad Date: Tue, 28 Nov 2023 12:25:10 -0700 Subject: [PATCH 5/5] Add a few more potential system fonts --- code/lib/theming/src/base.ts | 3 +++ node_modules/.yarn-state.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/lib/theming/src/base.ts b/code/lib/theming/src/base.ts index a322d46470a4..146d6ee95b42 100644 --- a/code/lib/theming/src/base.ts +++ b/code/lib/theming/src/base.ts @@ -76,10 +76,13 @@ export const typography = { 'ui-monospace', 'Menlo', 'Monaco', + '"Cascadia Mono"', + '"Segoe UI Mono"', '"Roboto Mono"', '"Oxygen Mono"', '"Ubuntu Monospace"', '"Source Code Pro"', + '"Fira Mono"', '"Droid Sans Mono"', '"Courier New"', 'monospace', diff --git a/node_modules/.yarn-state.yml b/node_modules/.yarn-state.yml index af981fec0a05..a6b1a224e847 100644 --- a/node_modules/.yarn-state.yml +++ b/node_modules/.yarn-state.yml @@ -7,4 +7,4 @@ __metadata: "@storybook/root@workspace:.": locations: - - "" \ No newline at end of file + - ""