Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Don't prefer STIXGeneral over the default font #9711

Merged
merged 8 commits into from
Jan 6, 2023
Merged

Don't prefer STIXGeneral over the default font #9711

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8982964
Don't prefer STIXGeneral over the default font
robintown Dec 5, 2022
42907e8
Merge branch 'develop' into less-stix
robintown Jan 4, 2023
9cfede6
Explain why STIXGeneral shouldn't have precedence
robintown Jan 4, 2023
3b81d2e
Add a regression test
robintown Jan 4, 2023
cd8f2c5
Merge branch 'develop' into less-stix
robintown Jan 4, 2023
030b74a
Merge branch 'develop' into less-stix
robintown Jan 5, 2023
b1f6259
Merge branch 'develop' into less-stix
robintown Jan 5, 2023
57b5313
Install STIXGeneral in Cypress runners
robintown Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions res/themes/legacy-light/css/_legacy-light.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
/* Noto Color Emoji contains digits, in fixed-width, therefore causing
digits in flowed text to stand out.
TODO: Consider putting all emoji fonts to the end rather than the front. */
$font-family: 'Nunito', 'Twemoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'STIXGeneral', 'Arial', 'Helvetica', sans-serif, 'Noto Color Emoji';
$font-family: 'Nunito', 'Twemoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Arial', 'Helvetica', sans-serif, 'STIXGeneral', 'Noto Color Emoji';

$monospace-font-family: 'Inconsolata', 'Twemoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'STIXGeneral', 'Courier', monospace, 'Noto Color Emoji';
$monospace-font-family: 'Inconsolata', 'Twemoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Courier', monospace, 'STIXGeneral', 'Noto Color Emoji';

/* unified palette */
/* try to use these colors when possible */
Expand Down
4 changes: 2 additions & 2 deletions res/themes/light/css/_light.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ $font-family: 'Inter',
'Twemoji',
'Apple Color Emoji',
'Segoe UI Emoji',
'STIXGeneral',
'Arial',
'Helvetica',
sans-serif,
'STIXGeneral',
'Noto Color Emoji';

$monospace-font-family: 'Inconsolata',
'Twemoji',
'Apple Color Emoji',
'Segoe UI Emoji',
'STIXGeneral',
'Courier',
monospace,
'STIXGeneral',
'Noto Color Emoji';

/* Colors from Figma Compound https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=559%3A120 */
Expand Down