Skip to content

Set root font size to 100% #4784

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 5 commits into from
Dec 8, 2021
Merged

Set root font size to 100% #4784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c89553
Set root font size to 100%
aveline Dec 2, 2021
07b06fc
Convert rem values to px
aveline Dec 2, 2021
eee2fb4
try a fix for chromatic diffs 🧪
aveline Dec 2, 2021
a4f041c
Update rem values for chromatic snapshots
aveline Dec 2, 2021
047a862
Update rem values for Chromatic snapshots
aveline Dec 2, 2021
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
5 changes: 5 additions & 0 deletions .storybook/preview-body.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<style>
.sb-show-main.sb-main-padded {
padding: 10px;
}
</style>
Comment on lines +1 to +5
Copy link
Member

@alex-page alex-page Dec 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Love this to make tophatting this PR easy. Lets do a follow up PR that removes it by itself 💯

2 changes: 1 addition & 1 deletion config/postcss-plugins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const pxtorem = require('postcss-pxtorem');
module.exports = [
postcssShopify,
pxtorem({
rootValue: 10,
rootValue: 16,
replace: true,
propList: ['*'],
}),
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 @@ -22,7 +22,7 @@ button {

html {
position: relative;
font-size: ($base-font-size / $default-browser-font-size) * 100%;
Copy link
Member

@kyledurand kyledurand Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these vars used elsewhere? Maybe we can 🔥 one or both

Copy link
Contributor Author

@aveline aveline Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are but will be removed soon! Possibly as part of #4777

font-size: 100%;
-webkit-font-smoothing: antialiased;

// This needs to come after -webkit-font-smoothing
Expand Down
2 changes: 1 addition & 1 deletion src/components/DropZone/components/FileUpload/FileUpload.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $slim-vertical-padding: ($slim-min-height - line-height(body) - 2px) / 2;
}

.small {
padding: 1.25rem;
padding: var(--p-space-3);
}

.FileUpload img {
Expand Down
4 changes: 2 additions & 2 deletions src/components/IndexTable/IndexTable.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,8 @@ $scroll-bar-size: var(--p-space-2);
display: flex;
align-items: flex-start;
width: 100%;
min-height: 5.6rem;
padding: 1rem var(--p-space-4);
min-height: 56px;
padding: 10px var(--p-space-4);
background-color: var(--p-surface);

&.unselectable {
Expand Down
8 changes: 4 additions & 4 deletions src/components/IndexTable/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ function IndexTableWithFilteringExample() {
onClearAll={handleClearAll}
/>
</div>
<div style={{paddingLeft: '0.4rem'}}>
<div style={{paddingLeft: '0.25rem'}}>
<Select
labelInline
label="Sort by"
Expand Down Expand Up @@ -1151,7 +1151,7 @@ function IndexTableWithAllElementsExample() {
onClearAll={handleClearAll}
/>
</div>
<div style={{paddingLeft: '0.4rem'}}>
<div style={{paddingLeft: '0.25rem'}}>
<Select
labelInline
label="Sort by"
Expand Down Expand Up @@ -1312,7 +1312,7 @@ function SmallScreenIndexTableWithAllElementsExample() {
selected={selectedResources.includes(id)}
position={index}
>
<div style={{padding: '1.2rem 1.6rem'}}>
<div style={{padding: '.75rem 1rem'}}>
<p>
<TextStyle variation="strong">{name}</TextStyle>
</p>
Expand All @@ -1338,7 +1338,7 @@ function SmallScreenIndexTableWithAllElementsExample() {
onClearAll={handleClearAll}
/>
</div>
<div style={{paddingLeft: '0.4rem'}}>
<div style={{paddingLeft: '0.25rem'}}>
<Select
labelInline
label="Sort by"
Expand Down
2 changes: 1 addition & 1 deletion src/components/Layout/Layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ $relative-size: $primary-basis / $secondary-basis;
min-width: 51%;

@media print {
flex: 2 2 36rem;
flex: 2 2 360px;
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/components/Sheet/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ function SheetExample() {
borderBottom: '1px solid #DFE3E8',
display: 'flex',
justifyContent: 'space-between',
padding: '1.6rem',
padding: '1rem',
width: '100%',
}}
>
Expand All @@ -169,7 +169,7 @@ function SheetExample() {
plain
/>
</div>
<Scrollable style={{padding: '1.6rem', height: '100%'}}>
<Scrollable style={{padding: '1rem', height: '100%'}}>
<ChoiceList
title="Select a sales channel"
name="salesChannelsList"
Expand All @@ -186,7 +186,7 @@ function SheetExample() {
borderTop: '1px solid #DFE3E8',
display: 'flex',
justifyContent: 'space-between',
padding: '1.6rem',
padding: '1rem',
width: '100%',
}}
>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Subheading/Subheading.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
margin: 0;

@media print {
font-size: 1.1rem;
font-size: 11px;
}
}
30 changes: 15 additions & 15 deletions src/tokens/_legacy-tokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,25 @@ export const legacyTokens: TokenGroup = {
'button-inner-shadow': 'inset 0 -1px 0 rgba(0, 0, 0, 0.2)',
'button-pressed-inner-shadow': 'inset 0 1px 0 rgba(0, 0, 0, 0.15)',
'override-loading-z-index': '514',
'choice-size': '2rem',
'icon-size': '1rem',
'choice-margin': '0.1rem',
'control-border-width': '0.2rem',
'choice-size': '20px',
'icon-size': '10px',
'choice-margin': '1px',
'control-border-width': '2px',
'banner-border-default':
'inset 0 0.1rem 0 0 var(--p-border-neutral-subdued), inset 0 0 0 0.1rem var(--p-border-neutral-subdued)',
'inset 0 1px 0 0 var(--p-border-neutral-subdued), inset 0 0 0 1px var(--p-border-neutral-subdued)',
'banner-border-success':
'inset 0 0.1rem 0 0 var(--p-border-success-subdued), inset 0 0 0 0.1rem var(--p-border-success-subdued)',
'inset 0 1px 0 0 var(--p-border-success-subdued), inset 0 0 0 1px var(--p-border-success-subdued)',
'banner-border-highlight':
'inset 0 0.1rem 0 0 var(--p-border-highlight-subdued), inset 0 0 0 0.1rem var(--p-border-highlight-subdued)',
'inset 0 1px 0 0 var(--p-border-highlight-subdued), inset 0 0 0 1px var(--p-border-highlight-subdued)',
'banner-border-warning':
'inset 0 0.1rem 0 0 var(--p-border-warning-subdued), inset 0 0 0 0.1rem var(--p-border-warning-subdued)',
'inset 0 1px 0 0 var(--p-border-warning-subdued), inset 0 0 0 1px var(--p-border-warning-subdued)',
'banner-border-critical':
'inset 0 0.1rem 0 0 var(--p-border-critical-subdued), inset 0 0 0 0.1rem var(--p-border-critical-subdued)',
'thin-border-subdued': '0.1rem solid var(--p-border-subdued)',
'text-field-spinner-offset': '0.2rem',
'text-field-focus-ring-offset': '-0.4rem',
'button-group-item-spacing': '-0.1rem',
'range-slider-thumb-size-base': '1.6rem',
'range-slider-thumb-size-active': '2.4rem',
'inset 0 1px 0 0 var(--p-border-critical-subdued), inset 0 0 0 1px var(--p-border-critical-subdued)',
'thin-border-subdued': '1px solid var(--p-border-subdued)',
'text-field-spinner-offset': '2px',
'text-field-focus-ring-offset': '-4px',
'button-group-item-spacing': '-1px',
'range-slider-thumb-size-base': '16px',
'range-slider-thumb-size-active': '24px',
'frame-offset': '0px',
};