Skip to content

Rename font-family-base token #4955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 25, 2022
Merged

Rename font-family-base token #4955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbcdb78
Update UNRELEASED-v8.md
lgriffee Jan 25, 2022
cedd0a0
Rename font-family-base token
lgriffee Jan 25, 2022
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
2 changes: 1 addition & 1 deletion UNRELEASED-v8.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t
- Removed the border-radius() function and replaced any instances with tokens ([#4793](https://github.com/Shopify/polaris-react/pull/4793))
- Removed the shadow() function (replaced any instances with tokens) and renamed shadow legacy tokens ([#4823](https://github.com/Shopify/polaris-react/pull/4823))
- Removed the ms-high-contrast-color() function and replaced any instances with values ([#4938](https://github.com/Shopify/polaris-react/pull/4938))
- Removed the font-family() function and replaced any instances with values ([#4940](https://github.com/Shopify/polaris-react/pull/4940))
- Removed the font-family() function and replaced any instances with tokens ([#4940](https://github.com/Shopify/polaris-react/pull/4940))

### New components

Expand Down
2 changes: 1 addition & 1 deletion src/components/AppProvider/AppProvider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ body {
html,
body,
button {
font-family: var(--p-font-family-base);
font-family: var(--p-font-family-sans);
}

html {
Expand Down
2 changes: 1 addition & 1 deletion src/components/KeyboardKey/KeyboardKey.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ $key-base-height: 24px;
0 var(--p-space-05) 0 0 var(--p-surface),
0 var(--p-space-05) 0 1px var(--p-border-subdued);
border-radius: var(--p-border-radius-1);
font-family: var(--p-font-family-base);
font-family: var(--p-font-family-sans);
font-size: 12px;
font-weight: var(--p-font-weight-medium);
line-height: $key-base-height;
Expand Down
2 changes: 1 addition & 1 deletion src/components/TextField/TextField.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ $prefix-horizontal-spacing: var(--p-space-2);
padding: control-vertical-padding() $backdrop-horizontal-spacing;
background: none;
border: border(transparent);
font-family: var(--p-font-family-base);
font-family: var(--p-font-family-sans);
appearance: none;
caret-color: var(--p-text);
color: var(--p-text);
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/token-groups/typography.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"font-family-base": "-apple-system, BlinkMacSystemFont, 'San Francisco', 'Segoe UI', Roboto, 'Helvetica Neue', sans-serif",
"font-family-sans": "-apple-system, BlinkMacSystemFont, 'San Francisco', 'Segoe UI', Roboto, 'Helvetica Neue', sans-serif",
"font-family-mono": "ui-monospace, SFMono-Regular, 'SF Mono', Consolas, 'Liberation Mono', Menlo, monospace",

"font-size-1": "12px",
Expand Down