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): update v10 token styles #11977

Merged
merged 11 commits into from
Aug 22, 2022
Merged

fix(type): update v10 token styles #11977

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
44f877a
fix(type): update v10 token styles
jnm2377 Aug 18, 2022
ea05f9b
fix: productive heading 05 weight
jnm2377 Aug 19, 2022
2780f24
fix: js scale and line height
jnm2377 Aug 19, 2022
7e0052d
fix: make changes in styles
jnm2377 Aug 19, 2022
52ed251
chore: update type snapshot
jnm2377 Aug 19, 2022
4e32082
fix: font size scale in js and scss
jnm2377 Aug 19, 2022
816df69
feat: add comments for js and scss scale
jnm2377 Aug 19, 2022
2d90032
chore: update type tests and snapshots
jnm2377 Aug 19, 2022
dedefa4
fix: update comment
jnm2377 Aug 22, 2022
674399e
chore: update grid snapshot
jnm2377 Aug 22, 2022
3d1b0cc
Update packages/type/scss/_scale.scss
jnm2377 Aug 22, 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
44 changes: 22 additions & 22 deletions packages/type/scss/_styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ $heading-04: $productive-heading-04 !default;
/// @group @carbon/type
$productive-heading-05: (
font-size: carbon--type-scale(8),
font-weight: carbon--font-weight('regular'),
font-weight: carbon--font-weight('light'),
line-height: 1.25,
letter-spacing: 0,
) !default;
Expand Down Expand Up @@ -364,9 +364,11 @@ $expressive-heading-04: (
xlg: (
font-size: carbon--type-scale(7),
line-height: 1.25,
font-weight: carbon--font-weight('light'),
),
max: (
font-size: carbon--type-scale(8),
font-weight: carbon--font-weight('light'),
),
),
) !default;
Expand All @@ -381,13 +383,12 @@ $fluid-heading-04: $expressive-heading-04 !default;
/// @group @carbon/type
$expressive-heading-05: (
font-size: carbon--type-scale(8),
font-weight: carbon--font-weight('regular'),
font-weight: carbon--font-weight('light'),
line-height: 1.25,
letter-spacing: 0,
breakpoints: (
md: (
font-size: carbon--type-scale(9),
font-weight: carbon--font-weight('light'),
line-height: 1.22,
),
lg: (
Expand Down Expand Up @@ -598,28 +599,28 @@ $fluid-display-02: $display-02 !default;
/// @access public
/// @group @carbon/type
$display-03: (
font-size: carbon--type-scale(10),
font-size: carbon--type-scale(11),
font-weight: carbon--font-weight('light'),
line-height: 1.19,
letter-spacing: 0,
breakpoints: (
md: (
font-size: carbon--type-scale(14),
line-height: 1.15,
font-size: carbon--type-scale(13),
line-height: 1.18,
),
lg: (
font-size: carbon--type-scale(17),
line-height: 1.11,
font-size: carbon--type-scale(14),
line-height: 1.16,
letter-spacing: -0.64px,
),
xlg: (
font-size: carbon--type-scale(20),
line-height: 1.07,
font-size: carbon--type-scale(16),
line-height: 1.13,
letter-spacing: -0.64px,
),
max: (
font-size: carbon--type-scale(23),
line-height: 1.05,
font-size: carbon--type-scale(17),
line-height: 1.11,
letter-spacing: -0.96px,
),
),
Expand All @@ -634,27 +635,26 @@ $fluid-display-03: $display-03 !default;
/// @access public
/// @group @carbon/type
$display-04: (
font-size: carbon--type-scale(10),
font-weight: carbon--font-weight('semibold'),
font-size: carbon--type-scale(11),
font-weight: carbon--font-weight('light'),
line-height: 1.19,
letter-spacing: 0,
breakpoints: (
md: (
font-size: carbon--type-scale(14),
line-height: 1.15,
font-size: carbon--type-scale(15),
line-height: 1.14,
),
lg: (
font-size: carbon--type-scale(17),
line-height: 1.11,
font-size: carbon--type-scale(18),
line-height: 1.1,
letter-spacing: -0.64px,
),
xlg: (
font-size: carbon--type-scale(20),
line-height: 1.07,
letter-spacing: -0.64px,
font-size: carbon--type-scale(21),
line-height: 1.06,
),
max: (
font-size: carbon--type-scale(23),
font-size: carbon--type-scale(24),
line-height: 1.05,
letter-spacing: -0.96px,
),
Expand Down
47 changes: 22 additions & 25 deletions packages/type/src/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export const productiveHeading04 = {

export const productiveHeading05 = {
fontSize: rem(scale[7]),
fontWeight: fontWeights.regular,
fontWeight: fontWeights.light,
lineHeight: 1.25,
letterSpacing: 0,
};
Expand Down Expand Up @@ -193,40 +193,38 @@ export const expressiveHeading04 = {
xlg: {
fontSize: rem(scale[6]),
lineHeight: 1.25,
fontWeight: fontWeights.light,
},
max: {
fontSize: rem(scale[7]),
fontWeight: fontWeights.light,
},
},
};

export const expressiveHeading05 = {
fontSize: rem(scale[7]),
fontWeight: fontWeights.regular,
fontWeight: fontWeights.light,
lineHeight: 1.25,
letterSpacing: 0,
breakpoints: {
md: {
fontSize: rem(scale[8]),
fontWeight: fontWeights.light,
lineHeight: 1.22,
letterSpacing: 0,
},
lg: {
fontSize: rem(scale[9]),
fontWeight: fontWeights.light,
lineHeight: 1.19,
letterSpacing: 0,
},
xlg: {
fontSize: rem(scale[10]),
fontWeight: fontWeights.light,
lineHeight: 1.17,
letterSpacing: 0,
},
max: {
fontSize: rem(scale[12]),
fontWeight: fontWeights.light,
letterSpacing: 0,
},
},
Expand Down Expand Up @@ -386,54 +384,53 @@ export const display02 = {
};

export const display03 = {
fontSize: rem(scale[9]),
fontSize: rem(scale[10]),
fontWeight: fontWeights.light,
lineHeight: 1.19,
letterSpacing: 0,
breakpoints: {
md: {
fontSize: rem(scale[13]),
lineHeight: 1.15,
fontSize: rem(scale[12]),
lineHeight: 1.18,
},
lg: {
fontSize: rem(scale[16]),
lineHeight: 1.11,
fontSize: rem(scale[13]),
lineHeight: 1.16,
letterSpacing: px(-0.64),
},
xlg: {
fontSize: rem(scale[19]),
lineHeight: 1.07,
fontSize: rem(scale[15]),
lineHeight: 1.13,
},
max: {
fontSize: rem(scale[22]),
lineHeight: 1.05,
fontSize: rem(scale[16]),
lineHeight: 1.11,
letterSpacing: px(-0.96),
},
},
};

export const display04 = {
fontSize: rem(scale[9]),
fontWeight: fontWeights.semibold,
fontSize: rem(scale[10]),
fontWeight: fontWeights.light,
lineHeight: 1.19,
letterSpacing: 0,
breakpoints: {
md: {
fontSize: rem(scale[13]),
lineHeight: 1.15,
fontSize: rem(scale[14]),
lineHeight: 1.14,
},
lg: {
fontSize: rem(scale[16]),
lineHeight: 1.11,
fontSize: rem(scale[17]),
lineHeight: 1.1,
letterSpacing: px(-0.64),
},
xlg: {
fontSize: rem(scale[19]),
lineHeight: 1.07,
letterSpacing: px(-0.64),
fontSize: rem(scale[20]),
lineHeight: 1.06,
},
max: {
fontSize: rem(scale[22]),
fontSize: rem(scale[23]),
lineHeight: 1.05,
letterSpacing: px(-0.96),
},
Expand Down