From 38d340d17615f9d3ea7105b791e09041d3e767d7 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Tue, 7 Jan 2025 05:17:36 -0800 Subject: [PATCH] Remove courier fonts from defaults Fixes #5156 --- addons/addon-serialize/src/SerializeAddon.test.ts | 4 ++-- demo/client.ts | 2 +- src/common/services/OptionsService.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/addon-serialize/src/SerializeAddon.test.ts b/addons/addon-serialize/src/SerializeAddon.test.ts index 7cb071bf..0252b201 100644 --- a/addons/addon-serialize/src/SerializeAddon.test.ts +++ b/addons/addon-serialize/src/SerializeAddon.test.ts @@ -222,7 +222,7 @@ describe('SerializeAddon', () => { it('empty terminal with default options', async () => { const output = serializeAddon.serializeAsHTML(); - assert.equal((output.match(/color: #000000; background-color: #ffffff; font-family: courier-new, courier, monospace; font-size: 15px;/g) || []).length, 1, output); + assert.equal((output.match(/color: #000000; background-color: #ffffff; font-family: monospace; font-size: 15px;/g) || []).length, 1, output); }); it('empty terminal with custom options', async () => { @@ -242,7 +242,7 @@ describe('SerializeAddon', () => { const output = serializeAddon.serializeAsHTML({ includeGlobalBackground: true }); - assert.equal((output.match(/color: #ffffff; background-color: #000000; font-family: courier-new, courier, monospace; font-size: 15px;/g) || []).length, 1, output); + assert.equal((output.match(/color: #ffffff; background-color: #000000; font-family: monospace; font-size: 15px;/g) || []).length, 1, output); }); it('cells with custom color styling', async () => { diff --git a/demo/client.ts b/demo/client.ts index 02cef73b..4cf465ae 100644 --- a/demo/client.ts +++ b/demo/client.ts @@ -262,7 +262,7 @@ function createTerminal(): void { backend: 'conpty', buildNumber: 22621 } : undefined, - fontFamily: '"Fira Code", courier-new, courier, monospace, "Powerline Extra Symbols"', + fontFamily: '"Fira Code", monospace, "Powerline Extra Symbols"', theme: xtermjsTheme } as ITerminalOptions); diff --git a/src/common/services/OptionsService.ts b/src/common/services/OptionsService.ts index 4b8ca822..86d9ca71 100644 --- a/src/common/services/OptionsService.ts +++ b/src/common/services/OptionsService.ts @@ -21,7 +21,7 @@ export const DEFAULT_OPTIONS: Readonly> = { documentOverride: null, fastScrollModifier: 'alt', fastScrollSensitivity: 5, - fontFamily: 'courier-new, courier, monospace', + fontFamily: 'monospace', fontSize: 15, fontWeight: 'normal', fontWeightBold: 'bold',