Skip to content
This repository has been archived by the owner on Apr 13, 2022. It is now read-only.

Update font stack #131

Merged
merged 3 commits into from
Apr 8, 2020
Merged

Update font stack #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b13da6
Bump Segoe UI's priority in font stack
martenbjork Apr 6, 2020
589e6ce
Update snapshots
martenbjork Apr 6, 2020
5460809
Updated the changelog
martenbjork Apr 8, 2020
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: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

<!-- ## [Unreleased] -->
## [Unreleased]

- Updated the font stack so that Segoe UI comes before Roboto. ([#131](https://github.com/Shopify/polaris-tokens/pull/131))

## [2.12.1] - 2020-03-18

Expand Down
2 changes: 1 addition & 1 deletion tests/__snapshots__/colors.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ exports[`Compare files snapshots renders index.d.ts as expected 1`] = `
durationSlow: 300;
durationSlower: 400;
durationSlowest: 500;
fontStackBase: \\"-apple-system, BlinkMacSystemFont, 'San Francisco', Roboto, 'Segoe UI', 'Helvetica Neue', sans-serif\\";
fontStackBase: \\"-apple-system, BlinkMacSystemFont, 'San Francisco', 'Segoe UI', Roboto, 'Helvetica Neue', sans-serif\\";
fontStackMonospace: \\"Monaco, Consolas, 'Lucida Console', monospace\\";
spacingBase: \\"16px\\";
spacingBaseTight: \\"12px\\";
Expand Down
2 changes: 1 addition & 1 deletion tests/__snapshots__/duration.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ exports[`Compare files snapshots renders index.d.ts as expected 1`] = `
durationSlow: 300;
durationSlower: 400;
durationSlowest: 500;
fontStackBase: \\"-apple-system, BlinkMacSystemFont, 'San Francisco', Roboto, 'Segoe UI', 'Helvetica Neue', sans-serif\\";
fontStackBase: \\"-apple-system, BlinkMacSystemFont, 'San Francisco', 'Segoe UI', Roboto, 'Helvetica Neue', sans-serif\\";
fontStackMonospace: \\"Monaco, Consolas, 'Lucida Console', monospace\\";
spacingBase: \\"16px\\";
spacingBaseTight: \\"12px\\";
Expand Down
2 changes: 1 addition & 1 deletion tokens/typography.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
props:
# Font stacks
- name: font-stack-base
value: -apple-system, BlinkMacSystemFont, 'San Francisco', Roboto, 'Segoe UI', 'Helvetica Neue', sans-serif
value: -apple-system, BlinkMacSystemFont, 'San Francisco', 'Segoe UI', Roboto, 'Helvetica Neue', sans-serif
type: font-family
category: font-family
- name: font-stack-monospace
Expand Down