Skip to content
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

Jump to bottom

fix: remap console semibold to medium font weight #195

Merged
merged 3 commits into from Nov 20, 2019
Merged

fix: remap console semibold to medium font weight #195

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
78ed486
fix: remap console semibold to medium font weight
SiTaggart Nov 20, 2019
ca00ef5
test: snapshot updates
SiTaggart Nov 20, 2019
8d8a96b
test: update missing snapshot
SiTaggart Nov 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 18 additions & 18 deletions packages/paste-core/components/button/__tests__/__snapshots__/button.test.tsx.snap
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@ exports[`Button States Has a disabled state 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
cursor: not-allowed;
border-width: 2px;
border-style: solid;
Expand Down Expand Up @@ -85,7 +85,7 @@ exports[`Button States Has a disabled state 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
cursor: not-allowed;
border-width: 2px;
border-style: solid;
Expand Down Expand Up @@ -115,7 +115,7 @@ exports[`Button States Has a disabled state 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
cursor: not-allowed;
border-width: 2px;
border-style: solid;
Expand Down Expand Up @@ -144,7 +144,7 @@ exports[`Button States Has a disabled state 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
cursor: not-allowed;
background: none;
color: #ecb6b6;
Expand All @@ -169,7 +169,7 @@ exports[`Button States Has a disabled state 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
cursor: not-allowed;
background: none;
color: #b3d3e9;
Expand All @@ -194,7 +194,7 @@ exports[`Button States Has a disabled state 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
cursor: not-allowed;
width: auto;
}
Expand Down Expand Up @@ -332,7 +332,7 @@ exports[`Button States Has a loading state 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
cursor: wait;
border-width: 2px;
border-style: solid;
Expand Down Expand Up @@ -432,7 +432,7 @@ exports[`Button States Has a loading state 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
cursor: wait;
border-width: 2px;
border-style: solid;
Expand Down Expand Up @@ -463,7 +463,7 @@ exports[`Button States Has a loading state 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
cursor: wait;
border-width: 2px;
border-style: solid;
Expand Down Expand Up @@ -492,7 +492,7 @@ exports[`Button States Has a loading state 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
cursor: wait;
background: none;
color: #921200;
Expand All @@ -517,7 +517,7 @@ exports[`Button States Has a loading state 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
cursor: wait;
background: none;
color: #032c5e;
Expand All @@ -542,7 +542,7 @@ exports[`Button States Has a loading state 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
cursor: wait;
width: auto;
}
Expand Down Expand Up @@ -883,7 +883,7 @@ exports[`Button Variants Has a destructive variant 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
-webkit-text-decoration: none;
text-decoration: none;
cursor: pointer;
Expand Down Expand Up @@ -987,7 +987,7 @@ exports[`Button Variants Has a destructive_link variant 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
-webkit-text-decoration: none;
text-decoration: none;
cursor: pointer;
Expand Down Expand Up @@ -1088,7 +1088,7 @@ exports[`Button Variants Has a link variant 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
-webkit-text-decoration: none;
text-decoration: none;
cursor: pointer;
Expand Down Expand Up @@ -1172,7 +1172,7 @@ exports[`Button Variants Has a primary variant 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
-webkit-text-decoration: none;
text-decoration: none;
cursor: pointer;
Expand Down Expand Up @@ -1295,7 +1295,7 @@ exports[`Button Variants Has a reset variant 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
-webkit-text-decoration: none;
text-decoration: none;
cursor: pointer;
Expand Down Expand Up @@ -1381,7 +1381,7 @@ exports[`Button Variants Has a secondary variant 1`] = `
-webkit-transition: background-color 100ms ease-in,border-color 100ms ease-in;
transition: background-color 100ms ease-in,border-color 100ms ease-in;
font-family: 'Whitney SSm A','Whitney SSm B','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 600;
font-weight: 500;
-webkit-text-decoration: none;
text-decoration: none;
cursor: pointer;
Expand Down
14 changes: 7 additions & 7 deletions packages/paste-core/components/heading/__tests__/__snapshots__/heading.test.tsx.snap
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ exports[`Heading it should render an H1 at fontSize90 1`] = `
color: #282a2b;
margin-bottom: 1.5rem;
font-size: 2rem;
font-weight: 600;
font-weight: 500;
line-height: 2.5rem;
}

Expand Down Expand Up @@ -62,7 +62,7 @@ exports[`Heading it should render an H2 at fontSize70 1`] = `
color: #282a2b;
margin-bottom: 1.25rem;
font-size: 1.5rem;
font-weight: 600;
font-weight: 500;
line-height: 2rem;
}

Expand Down Expand Up @@ -102,7 +102,7 @@ exports[`Heading it should render an H3 at fontSize60 1`] = `
color: #282a2b;
margin-bottom: 1rem;
font-size: 1.25rem;
font-weight: 600;
font-weight: 500;
line-height: 1.75rem;
}

Expand Down Expand Up @@ -142,7 +142,7 @@ exports[`Heading it should render an H4 at fontSize40 1`] = `
color: #282a2b;
margin-bottom: 0.75rem;
font-size: 1rem;
font-weight: 600;
font-weight: 500;
line-height: 1.75rem;
}

Expand Down Expand Up @@ -182,7 +182,7 @@ exports[`Heading it should render an H5 at fontSize30 1`] = `
color: #282a2b;
margin-bottom: 0.5rem;
font-size: 0.875rem;
font-weight: 600;
font-weight: 500;
line-height: 1.5rem;
}

Expand Down Expand Up @@ -222,7 +222,7 @@ exports[`Heading it should render an H6 at fontSize20 1`] = `
color: #282a2b;
margin-bottom: 0.5rem;
font-size: 0.75rem;
font-weight: 600;
font-weight: 500;
line-height: 1.25rem;
}

Expand Down Expand Up @@ -262,7 +262,7 @@ exports[`Heading it should render an italic H2 at fontSize50 1`] = `
color: #282a2b;
margin-bottom: 1.25rem;
font-size: 1.5rem;
font-weight: 600;
font-weight: 500;
line-height: 2rem;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/paste-core/core-bundle/package.json
View file
Open in desktop
Expand Up @@ -60,4 +60,4 @@
"rollup-plugin-typescript2": "^0.21.2",
"typescript": "^3.5.2"
}
}
}
2 changes: 1 addition & 1 deletion packages/paste-core/utilities/text/__tests__/__snapshots__/text.spec.tsx.snap
View file
Open in desktop
Expand Up @@ -434,7 +434,7 @@ exports[`fontWeight should set a responsive font weight property 1`] = `

@media screen and (min-width:25rem) {
.emotion-0 {
font-weight: 600;
font-weight: 500;
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/paste-design-tokens/tokens/global/font-weight.yml
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ props:
value: "{!font-weight-medium}"
comment: Font weight for medium weight
font-weight-semibold:
value: "{!font-weight-semibold}"
value: "{!font-weight-medium}"
TheSisb marked this conversation as resolved.
Show resolved Hide resolved
comment: Font weight for semibold weight
font-weight-bold:
value: "{!font-weight-bold}"
Expand Down
4 changes: 4 additions & 0 deletions packages/paste-design-tokens/tokens/themes/sendgrid/global/font-weight.yml
View file
Open in desktop
Expand Up @@ -4,3 +4,7 @@ global:
imports:
- ../../../global/font-weight.yml
- ../aliases/font-weight.yml
props:
font-weight-semibold:
value: "{!font-weight-semibold}"
comment: Font weight for semibold weight