Skip to content

fix(tokens): update --calcite-font-line-height-relative to resolve as a valid value #12828

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
matgalla merged 4 commits into from
Sep 5, 2025
Merged

fix(tokens): update --calcite-font-line-height-relative to resolve as a valid value #12828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
902c9e9
add core.size.relative.none
matgalla Sep 5, 2025
23c507e
update semantic.font.line-height.relative.default
matgalla Sep 5, 2025
d851299
update `none` to `normal` for previously comitted tokens
matgalla Sep 5, 2025
2f6d1aa
update test snapshots
jcfranco Sep 5, 2025
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
7 changes: 7 additions & 0 deletions packages/calcite-design-tokens/src/tokens/core/size.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,13 @@
"attributes": {
"category": "size"
}
},
"normal": {
"value": "normal",
"type": "sizing",
"attributes": {
"category": "size"
}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/calcite-design-tokens/src/tokens/semantic/font.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@
},
"relative": {
"default": {
"value": "{core.size.relative.auto}",
"value": "{core.size.relative.normal}",
"type": "lineHeights",
"description": "1",
"description": "normal",
"attributes": {
"category": "font",
"group": "line-height",
Expand Down
139 changes: 103 additions & 36 deletions packages/calcite-design-tokens/tests/spec/__snapshots__/index.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,7 @@ exports[`generated tokens > CSS > core should match 1`] = `
--calcite-size-relative-162: 162.5%;
--calcite-size-relative-200: 200%;
--calcite-size-relative-auto: auto;
--calcite-size-relative-normal: normal;
--calcite-z-index-0: -999999;
--calcite-z-index-1: 1;
--calcite-z-index-3: 300;
Expand Down Expand Up @@ -1009,7 +1010,7 @@ exports[`generated tokens > CSS > global should match 1`] = `
--calcite-font-line-height-fixed-base: 16px;
--calcite-font-line-height-fixed-lg: 20px;
--calcite-font-line-height-fixed-xl: 24px;
--calcite-font-line-height-relative: auto; /** 1 */
--calcite-font-line-height-relative: normal; /** normal */
--calcite-font-line-height-relative-tight: 1.25; /** 1.25 */
--calcite-font-line-height-relative-snug: 1.375; /** 1.375 */
--calcite-font-line-height-relative-normal: 1.5; /** 1.5 */
Expand Down Expand Up @@ -1438,7 +1439,7 @@ exports[`generated tokens > CSS > semantic should match 1`] = `
--calcite-font-line-height-fixed-base: 16px;
--calcite-font-line-height-fixed-lg: 20px;
--calcite-font-line-height-fixed-xl: 24px;
--calcite-font-line-height-relative: auto; /** 1 */
--calcite-font-line-height-relative: normal; /** normal */
--calcite-font-line-height-relative-tight: 1.25; /** 1.25 */
--calcite-font-line-height-relative-snug: 1.375; /** 1.375 */
--calcite-font-line-height-relative-normal: 1.5; /** 1.5 */
Expand Down Expand Up @@ -17893,6 +17894,33 @@ exports[`generated tokens > DOCS (internal) > core should match 1`] = `
"name": "Size Relative Auto",
"path": ["core", "size", "relative", "auto"]
},
{
"key": "{core.size.relative.normal}",
"value": "normal",
"type": "dimension",
"attributes": {
"category": "size",
"type": "size",
"item": "relative",
"subitem": "normal",
"names": {
"scss": "$calcite-size-relative-normal",
"css": "var(--calcite-size-relative-normal)",
"js": "core.size.relative.normal",
"docs": "core.size.relative.normal",
"es6": "calciteSizeRelativeNormal"
},
"calcite-schema": {
"system": "calcite",
"tier": "core",
"type": "dimension"
}
},
"filePath": "src/tokens/core/size.json",
"isSource": false,
"name": "Size Relative Normal",
"path": ["core", "size", "relative", "normal"]
},
{
"key": "{core.z-index.0}",
"value": "-999999",
Expand Down Expand Up @@ -21013,9 +21041,9 @@ exports[`generated tokens > DOCS (internal) > global should match 1`] = `
},
{
"key": "{semantic.font.line-height.relative.default}",
"value": "auto",
"value": "normal",
"type": "lineHeight",
"description": "1",
"description": "normal",
"attributes": {
"category": "font",
"group": "line-height",
Expand All @@ -21024,14 +21052,14 @@ exports[`generated tokens > DOCS (internal) > global should match 1`] = `
"item": "line-height",
"subitem": "relative",
"state": "default",
"value": "auto",
"description": "1",
"value": "normal",
"description": "normal",
"filePath": "src/tokens/semantic/font.json",
"isSource": true,
"key": "{semantic.font.line-height.relative.default}",
"name": "calcite-semantic-font-line-height-relative-default",
"path": ["semantic", "font", "line-height", "relative", "default"],
"comment": "1",
"comment": "normal",
"names": {
"scss": "$calcite-font-line-height-relative",
"css": "var(--calcite-font-line-height-relative)",
Expand All @@ -21049,7 +21077,7 @@ exports[`generated tokens > DOCS (internal) > global should match 1`] = `
"isSource": true,
"name": "Font Line Height Relative",
"path": ["semantic", "font", "line-height", "relative", "default"],
"comment": "1"
"comment": "normal"
},
{
"key": "{semantic.font.line-height.relative.tight}",
Expand Down Expand Up @@ -26794,9 +26822,9 @@ exports[`generated tokens > DOCS (internal) > semantic should match 1`] = `
},
{
"key": "{semantic.font.line-height.relative.default}",
"value": "auto",
"value": "normal",
"type": "lineHeight",
"description": "1",
"description": "normal",
"attributes": {
"category": "font",
"group": "line-height",
Expand All @@ -26805,14 +26833,14 @@ exports[`generated tokens > DOCS (internal) > semantic should match 1`] = `
"item": "line-height",
"subitem": "relative",
"state": "default",
"value": "auto",
"description": "1",
"value": "normal",
"description": "normal",
"filePath": "src/tokens/semantic/font.json",
"isSource": true,
"key": "{semantic.font.line-height.relative.default}",
"name": "calcite-semantic-font-line-height-relative-default",
"path": ["semantic", "font", "line-height", "relative", "default"],
"comment": "1",
"comment": "normal",
"names": {
"scss": "$calcite-font-line-height-relative",
"css": "var(--calcite-font-line-height-relative)",
Expand All @@ -26830,7 +26858,7 @@ exports[`generated tokens > DOCS (internal) > semantic should match 1`] = `
"isSource": true,
"name": "Font Line Height Relative",
"path": ["semantic", "font", "line-height", "relative", "default"],
"comment": "1"
"comment": "normal"
},
{
"key": "{semantic.font.line-height.relative.tight}",
Expand Down Expand Up @@ -29864,6 +29892,7 @@ export const calciteSizeRelative150 = "150%";
export const calciteSizeRelative162 = "162.5%";
export const calciteSizeRelative200 = "200%";
export const calciteSizeRelativeAuto = "auto";
export const calciteSizeRelativeNormal = "normal";
export const calciteZIndex0 = "-999999";
export const calciteZIndex1 = "1";
export const calciteZIndex3 = "300";
Expand Down Expand Up @@ -30496,6 +30525,7 @@ export const calciteSizeRelative150: string;
export const calciteSizeRelative162: string;
export const calciteSizeRelative200: string;
export const calciteSizeRelativeAuto: string;
export const calciteSizeRelativeNormal: string;
export const calciteZIndex0: string;
export const calciteZIndex1: string;
export const calciteZIndex3: string;
Expand Down Expand Up @@ -30676,7 +30706,7 @@ export const calciteFontLineHeightFixedSm = "12px";
export const calciteFontLineHeightFixedBase = "16px";
export const calciteFontLineHeightFixedLg = "20px";
export const calciteFontLineHeightFixedXl = "24px";
export const calciteFontLineHeightRelative = "auto"; // 1
export const calciteFontLineHeightRelative = "normal"; // normal
export const calciteFontLineHeightRelativeTight = "1.25"; // 1.25
export const calciteFontLineHeightRelativeSnug = "1.375"; // 1.375
export const calciteFontLineHeightRelativeNormal = "1.5"; // 1.5
Expand Down Expand Up @@ -31156,7 +31186,7 @@ export const calciteFontLineHeightFixedSm: string;
export const calciteFontLineHeightFixedBase: string;
export const calciteFontLineHeightFixedLg: string;
export const calciteFontLineHeightFixedXl: string;
/** 1 */
/** normal */
export const calciteFontLineHeightRelative: string;
/** 1.25 */
export const calciteFontLineHeightRelativeTight: string;
Expand Down Expand Up @@ -31595,7 +31625,7 @@ export const calciteFontLineHeightFixedSm = "12px";
export const calciteFontLineHeightFixedBase = "16px";
export const calciteFontLineHeightFixedLg = "20px";
export const calciteFontLineHeightFixedXl = "24px";
export const calciteFontLineHeightRelative = "auto"; // 1
export const calciteFontLineHeightRelative = "normal"; // normal
export const calciteFontLineHeightRelativeTight = "1.25"; // 1.25
export const calciteFontLineHeightRelativeSnug = "1.375"; // 1.375
export const calciteFontLineHeightRelativeNormal = "1.5"; // 1.5
Expand Down Expand Up @@ -31742,7 +31772,7 @@ export const calciteFontLineHeightFixedSm: string;
export const calciteFontLineHeightFixedBase: string;
export const calciteFontLineHeightFixedLg: string;
export const calciteFontLineHeightFixedXl: string;
/** 1 */
/** normal */
export const calciteFontLineHeightRelative: string;
/** 1.25 */
export const calciteFontLineHeightRelativeTight: string;
Expand Down Expand Up @@ -54116,6 +54146,41 @@ export default {
name: "Size Relative Auto",
path: ["core", "size", "relative", "auto"],
},
normal: {
key: "{core.size.relative.normal}",
value: "normal",
type: "dimension",
attributes: {
category: "size",
type: "size",
item: "relative",
subitem: "normal",
names: {
scss: "$calcite-size-relative-normal",
css: "var(--calcite-size-relative-normal)",
js: "core.size.relative.normal",
docs: "core.size.relative.normal",
es6: "calciteSizeRelativeNormal",
},
"calcite-schema": {
system: "calcite",
tier: "core",
type: "dimension",
},
},
filePath: "src/tokens/core/size.json",
isSource: false,
original: {
value: "normal",
type: "dimension",
attributes: {
category: "size",
},
key: "{core.size.relative.normal}",
},
name: "Size Relative Normal",
path: ["core", "size", "relative", "normal"],
},
},
},
"z-index": {
Expand Down Expand Up @@ -55158,6 +55223,7 @@ declare const tokens: {
"162": DesignToken;
"200": DesignToken;
auto: DesignToken;
normal: DesignToken;
};
};
"z-index": {
Expand Down Expand Up @@ -59204,9 +59270,9 @@ export default {
relative: {
default: {
key: "{semantic.font.line-height.relative.default}",
value: "auto",
value: "normal",
type: "lineHeight",
description: "1",
description: "normal",
attributes: {
category: "font",
group: "line-height",
Expand All @@ -59215,14 +59281,14 @@ export default {
item: "line-height",
subitem: "relative",
state: "default",
value: "auto",
description: "1",
value: "normal",
description: "normal",
filePath: "src/tokens/semantic/font.json",
isSource: true,
key: "{semantic.font.line-height.relative.default}",
name: "calcite-semantic-font-line-height-relative-default",
path: ["semantic", "font", "line-height", "relative", "default"],
comment: "1",
comment: "normal",
names: {
scss: "$calcite-font-line-height-relative",
css: "var(--calcite-font-line-height-relative)",
Expand All @@ -59239,9 +59305,9 @@ export default {
filePath: "src/tokens/semantic/font.json",
isSource: true,
original: {
value: "{core.size.relative.auto}",
value: "{core.size.relative.normal}",
type: "lineHeight",
description: "1",
description: "normal",
attributes: {
category: "font",
group: "line-height",
Expand All @@ -59251,7 +59317,7 @@ export default {
},
name: "Font Line Height Relative",
path: ["semantic", "font", "line-height", "relative", "default"],
comment: "1",
comment: "normal",
},
tight: {
key: "{semantic.font.line-height.relative.tight}",
Expand Down Expand Up @@ -67442,9 +67508,9 @@ export default {
relative: {
default: {
key: "{semantic.font.line-height.relative.default}",
value: "auto",
value: "normal",
type: "lineHeight",
description: "1",
description: "normal",
attributes: {
category: "font",
group: "line-height",
Expand All @@ -67453,14 +67519,14 @@ export default {
item: "line-height",
subitem: "relative",
state: "default",
value: "auto",
description: "1",
value: "normal",
description: "normal",
filePath: "src/tokens/semantic/font.json",
isSource: true,
key: "{semantic.font.line-height.relative.default}",
name: "calcite-semantic-font-line-height-relative-default",
path: ["semantic", "font", "line-height", "relative", "default"],
comment: "1",
comment: "normal",
names: {
scss: "$calcite-font-line-height-relative",
css: "var(--calcite-font-line-height-relative)",
Expand All @@ -67477,9 +67543,9 @@ export default {
filePath: "src/tokens/semantic/font.json",
isSource: true,
original: {
value: "{core.size.relative.auto}",
value: "{core.size.relative.normal}",
type: "lineHeight",
description: "1",
description: "normal",
attributes: {
category: "font",
group: "line-height",
Expand All @@ -67489,7 +67555,7 @@ export default {
},
name: "Font Line Height Relative",
path: ["semantic", "font", "line-height", "relative", "default"],
comment: "1",
comment: "normal",
},
tight: {
key: "{semantic.font.line-height.relative.tight}",
Expand Down Expand Up @@ -71370,6 +71436,7 @@ $calcite-size-relative-150: 150%;
$calcite-size-relative-162: 162.5%;
$calcite-size-relative-200: 200%;
$calcite-size-relative-auto: auto;
$calcite-size-relative-normal: normal;
$calcite-z-index-0: -999999;
$calcite-z-index-1: 1;
$calcite-z-index-3: 300;
Expand Down Expand Up @@ -71482,7 +71549,7 @@ $calcite-font-line-height-fixed-sm: 12px;
$calcite-font-line-height-fixed-base: 16px;
$calcite-font-line-height-fixed-lg: 20px;
$calcite-font-line-height-fixed-xl: 24px;
$calcite-font-line-height-relative: auto; // 1
$calcite-font-line-height-relative: normal; // normal
$calcite-font-line-height-relative-tight: 1.25; // 1.25
$calcite-font-line-height-relative-snug: 1.375; // 1.375
$calcite-font-line-height-relative-normal: 1.5; // 1.5
Expand Down Expand Up @@ -72091,7 +72158,7 @@ $calcite-font-line-height-fixed-sm: 12px;
$calcite-font-line-height-fixed-base: 16px;
$calcite-font-line-height-fixed-lg: 20px;
$calcite-font-line-height-fixed-xl: 24px;
$calcite-font-line-height-relative: auto; // 1
$calcite-font-line-height-relative: normal; // normal
$calcite-font-line-height-relative-tight: 1.25; // 1.25
$calcite-font-line-height-relative-snug: 1.375; // 1.375
$calcite-font-line-height-relative-normal: 1.5; // 1.5
Expand Down
Loading