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(type): fix heading type styles based on guidance and design kit #12037

Merged
merged 4 commits into from
Sep 8, 2022
Merged

fix(type): fix heading type styles based on guidance and design kit #12037

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa8dbc1
fix(type): fix heading type styles based on guidance and design kit
janhassel Aug 31, 2022
3e8557b
chore: update type style test snapshot
janhassel Aug 31, 2022
ae2b473
Merge branch 'main' of https://github.com/carbon-design-system/carbon…
janhassel Sep 1, 2022
35353e2
Merge branch 'main' into type-style-fixes
janhassel Sep 8, 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
12 changes: 6 additions & 6 deletions packages/styles/scss/__tests__/__snapshots__/type-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1878,7 +1878,7 @@ Object {
Object {
"position": Position {
"end": Object {
"column": 62,
"column": 66,
"line": 175,
},
"source": undefined,
Expand All @@ -1889,7 +1889,7 @@ Object {
},
"property": "font-size",
"type": "declaration",
"value": "var(--cds-productive-heading-06-font-size, 2rem)",
"value": "var(--cds-productive-heading-06-font-size, 2.625rem)",
},
Object {
"position": Position {
Expand Down Expand Up @@ -1972,7 +1972,7 @@ Object {
},
"property": "font-size",
"type": "declaration",
"value": "var(--cds-productive-heading-07-font-size, 2.625rem)",
"value": "var(--cds-productive-heading-07-font-size, 3.375rem)",
},
Object {
"position": Position {
Expand Down Expand Up @@ -7534,7 +7534,7 @@ Object {
Object {
"position": Position {
"end": Object {
"column": 51,
"column": 55,
"line": 749,
},
"source": undefined,
Expand All @@ -7545,7 +7545,7 @@ Object {
},
"property": "font-size",
"type": "declaration",
"value": "var(--cds-heading-06-font-size, 2rem)",
"value": "var(--cds-heading-06-font-size, 2.625rem)",
},
Object {
"position": Position {
Expand Down Expand Up @@ -7628,7 +7628,7 @@ Object {
},
"property": "font-size",
"type": "declaration",
"value": "var(--cds-heading-07-font-size, 2.625rem)",
"value": "var(--cds-heading-07-font-size, 3.375rem)",
},
Object {
"position": Position {
Expand Down
4 changes: 2 additions & 2 deletions packages/type/scss/_styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ $heading-05: $productive-heading-05 !default;
/// @access public
/// @group @carbon/type
$productive-heading-06: (
font-size: scale.type-scale(8),
font-size: scale.type-scale(10),
font-weight: font-family.font-weight('light'),
// Extra digit needed for precision in Chrome
line-height: 1.199,
Expand All @@ -263,7 +263,7 @@ $heading-06: $productive-heading-06 !default;
/// @access public
/// @group @carbon/type
$productive-heading-07: (
font-size: scale.type-scale(10),
font-size: scale.type-scale(12),
font-weight: font-family.font-weight('light'),
line-height: 1.19,
letter-spacing: 0,
Expand Down