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

fix(tokens): #1168 move typotokens into sym #1169

Merged
merged 13 commits into from
Oct 8, 2024
Merged

fix(tokens): #1168 move typotokens into sym #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a598152
fix semantic typo
larserbach Oct 2, 2024
03a2688
fix: use sys tokens in component tokens
larserbach Oct 2, 2024
0bfa3d2
fix: moves elevations to sys
larserbach Oct 2, 2024
c7138b0
minor
larserbach Oct 2, 2024
7a60bef
fixing inverse colors
larserbach Oct 7, 2024
5ee585f
removes bold-informative
larserbach Oct 7, 2024
ddf7e3c
minor
larserbach Oct 7, 2024
a7d2ec8
merge develop
larserbach Oct 8, 2024
9d768dd
fix(ui-library): removed readonly state for checkbox radio radiogroup…
ashk1996 Oct 7, 2024
3b74bb9
Merge branch 'develop' into fix/#1168-move-typotokens-into-sym
larserbach Oct 8, 2024
f7e7b1e
minor
larserbach Oct 8, 2024
4ae4bfc
fix container.informative
larserbach Oct 8, 2024
0ef1218
adds log
larserbach Oct 8, 2024
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/figma-design-tokens/config/style-dictionary.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,13 @@ async function run() {
],
},
},
log: {
warnings: 'warn', // 'warn' | 'error' | 'disabled'
verbosity: 'verbose', // 'default' | 'silent' | 'verbose'
errors: {
brokenReferences: 'throw', // 'throw' | 'console'
},
},
};
});

Expand Down
3 changes: 2 additions & 1 deletion packages/figma-design-tokens/input/tokens/$metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
"sys/light",
"sys/dark",
"sys/sizes",
"sys/shadows",
"sys/typography",
"sem/colors",
"sem/sizes",
"sem/borders",
"sem/shadows",
"sem/typography",
"sem/sizeVariants",
"cmp/color",
Expand Down
2,233 changes: 1,084 additions & 1,149 deletions packages/figma-design-tokens/input/tokens/$themes.json
View file
Open in desktop

Large diffs are not rendered by default.

128 changes: 58 additions & 70 deletions packages/figma-design-tokens/input/tokens/cmp/color.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,22 +112,22 @@
"inactive": {
"rest": {
"$type": "color",
"$value": "{sys.bordercolor.inverse.rest}",
"$value": "{sys.bordercolor.inverse.primary.rest}",
"$description": "also applies to indeterminate"
},
"hover": {
"$type": "color",
"$value": "{sys.bordercolor.inverse.hover}",
"$value": "{sys.bordercolor.inverse.primary.hover}",
"$description": "also applies to indeterminate"
},
"pressed": {
"$type": "color",
"$value": "{sys.bordercolor.inverse.pressed}",
"$value": "{sys.bordercolor.inverse.primary.pressed}",
"$description": "also applies to indeterminate"
},
"focus": {
"$type": "color",
"$value": "{sys.bordercolor.inverse.rest}",
"$value": "{sys.bordercolor.inverse.primary.rest}",
"$description": "also applies to indeterminate"
},
"disabled": {
Expand All @@ -137,7 +137,7 @@
},
"error": {
"$type": "color",
"$value": "{sys.bgcolor.bold.danger.rest}",
"$value": "{sys.bordercolor.inverse.error.rest}",
"$description": "also applies to indeterminate"
}
}
Expand Down Expand Up @@ -180,32 +180,32 @@
"inactive": {
"rest": {
"$type": "color",
"$value": "{sys.content.inverse.transparent}",
"$value": "{sys.content.transparent}",
"$description": "also applies to indeterminate"
},
"hover": {
"$type": "color",
"$value": "{sys.content.inverse.transparent}",
"$value": "{sys.content.transparent}",
"$description": "also applies to indeterminate"
},
"pressed": {
"$type": "color",
"$value": "{sys.content.inverse.transparent}",
"$value": "{sys.content.transparent}",
"$description": "also applies to indeterminate"
},
"focus": {
"$type": "color",
"$value": "{sys.content.inverse.transparent}",
"$value": "{sys.content.transparent}",
"$description": "also applies to indeterminate"
},
"disabled": {
"$type": "color",
"$value": "{sys.content.inverse.transparent}",
"$value": "{sys.content.transparent}",
"$description": "also applies to indeterminate"
},
"error": {
"$type": "color",
"$value": "{sys.content.inverse.transparent}",
"$value": "{sys.content.transparent}",
"$description": "also applies to indeterminate"
}
}
Expand Down Expand Up @@ -686,126 +686,114 @@
"inactive": {
"rest": {
"$type": "color",
"$value": "{sys.bgcolor.bold.primary.rest}",
"$description": "forms.radio.control.background.unselected.fill.rest"
"$value": "{sys.bordercolor.inverse.primary.rest}"
},
"hover": {
"$type": "color",
"$value": "{sys.bgcolor.bold.primary.hover}",
"$description": "forms.radio.control.background.unselected.fill.hover"
"$value": "{sys.bordercolor.inverse.primary.hover}"
},
"pressed": {
"$type": "color",
"$value": "{sys.bgcolor.bold.primary.pressed}",
"$description": "forms.radio.control.background.unselected.fill.pressed"
"$value": "{sys.bordercolor.inverse.primary.pressed}"
},
"focus": {
"$type": "color",
"$value": "{sys.bgcolor.bold.primary.rest}",
"$description": "forms.radio.control.background.unselected.fill.focus"
"$value": "{sys.bordercolor.inverse.primary.rest}"
},
"disabled": {
"$type": "color",
"$value": "{sys.bgcolor.bold.disabled}",
"$description": "forms.radio.control.background.unselected.fill.disabled"
"$value": "{sys.bordercolor.inverse.disabled}"
},
"error": {
"$type": "color",
"$value": "{sys.bgcolor.bold.danger.rest}",
"$description": "forms.radio.control.background.unselected.fill.error"
"$value": "{sys.bordercolor.inverse.error.rest}"
}
},
"active": {
"rest": {
"$type": "color",
"$value": "{sys.bgcolor.bold.primary.rest}",
"$description": "forms.radio.control.background.selected.fill.rest"
"$value": "{sys.bgcolor.bold.primary.rest}"
},
"hover": {
"$type": "color",
"$value": "{sys.bgcolor.bold.primary.hover}",
"$description": "forms.radio.control.background.selected.fill.hover"
"$value": "{sys.bgcolor.bold.primary.hover}"
},
"pressed": {
"$type": "color",
"$value": "{sys.bgcolor.bold.primary.pressed}",
"$description": "forms.radio.control.background.selected.fill.pressed"
"$value": "{sys.bgcolor.bold.primary.pressed}"
},
"focus": {
"$type": "color",
"$value": "{sys.bgcolor.bold.primary.rest}",
"$description": "forms.radio.control.background.selected.fill.focus"
"$value": "{sys.bordercolor.inverse.primary.rest}"
},
"disabled": {
"$type": "color",
"$value": "{sys.bgcolor.bold.disabled}",
"$description": "forms.radio.control.background.selected.fill.disabled"
"$value": "{sys.bordercolor.inverse.disabled}"
},
"error": {
"$type": "color",
"$value": "{sys.bgcolor.bold.danger.rest}",
"$description": "forms.radio.control.background.unselected.fill.error"
"$value": "{sys.bordercolor.inverse.error.rest}"
}
}
},
"bordercolor": {
"inactive": {
"active": {
"rest": {
"$type": "color",
"$value": "{sys.bgcolor.bold.primary.rest}",
"$description": "forms.radio.control.background.unselected.fill.rest"
"$description": "forms.radio.control.background.selected.fill.rest"
},
"hover": {
"$type": "color",
"$value": "{sys.bgcolor.bold.primary.hover}",
"$description": "forms.radio.control.background.unselected.fill.hover"
"$description": "forms.radio.control.background.selected.fill.hover"
},
"pressed": {
"$type": "color",
"$value": "{sys.bgcolor.bold.primary.pressed}",
"$description": "forms.radio.control.background.unselected.fill.pressed"
"$description": "forms.radio.control.background.selected.fill.pressed"
},
"focus": {
"$type": "color",
"$value": "{sys.bgcolor.bold.primary.rest}",
"$description": "forms.radio.control.background.unselected.fill.focus"
"$description": "forms.radio.control.background.selected.fill.focus"
},
"disabled": {
"$type": "color",
"$value": "{sys.bgcolor.bold.disabled}",
"$description": "forms.radio.control.background.unselected.fill.disabled"
"$description": "forms.radio.control.background.selected.fill.disabled"
},
"error": {
"$type": "color",
"$value": "{sys.bgcolor.bold.danger.rest}",
"$value": "{sys.bordercolor.inverse.error.rest}",
"$description": "forms.radio.control.background.unselected.fill.error"
}
},
"active": {
"inactive": {
"rest": {
"$type": "color",
"$value": "{sys.bgcolor.bold.primary.rest}",
"$description": "forms.radio.control.background.selected.fill.rest"
"$value": "{sys.bordercolor.inverse.primary.rest}",
"$description": "forms.radio.control.background.unselected.fill.rest"
},
"hover": {
"$type": "color",
"$value": "{sys.bgcolor.bold.primary.hover}",
"$description": "forms.radio.control.background.selected.fill.hover"
"$value": "{sys.bordercolor.inverse.primary.hover}",
"$description": "forms.radio.control.background.unselected.fill.hover"
},
"pressed": {
"$type": "color",
"$value": "{sys.bgcolor.bold.primary.pressed}",
"$description": "forms.radio.control.background.selected.fill.pressed"
"$value": "{sys.bordercolor.inverse.primary.pressed}",
"$description": "forms.radio.control.background.unselected.fill.pressed"
},
"focus": {
"$type": "color",
"$value": "{sys.bgcolor.bold.primary.rest}",
"$description": "forms.radio.control.background.selected.fill.focus"
"$value": "{sys.bordercolor.inverse.primary.rest}",
"$description": "forms.radio.control.background.unselected.fill.focus"
},
"disabled": {
"$type": "color",
"$value": "{sys.bgcolor.bold.disabled}",
"$description": "forms.radio.control.background.selected.fill.disabled"
"$value": "{sys.bordercolor.inverse.disabled}",
"$description": "forms.radio.control.background.unselected.fill.disabled"
},
"error": {
"$type": "color",
Expand All @@ -820,64 +808,64 @@
"inactive": {
"rest": {
"$type": "color",
"$value": "{sys.content.bold.primary.regular}",
"$value": "{sys.bgcolor.inverse.rest}",
"$description": "forms.radio.control.foreground.unselected.fill.rest"
},
"hover": {
"$type": "color",
"$value": "{sys.content.bold.primary.regular}",
"$value": "{sys.bgcolor.inverse.hover}",
"$description": "forms.radio.control.foreground.unselected.fill.hover"
},
"pressed": {
"$type": "color",
"$value": "{sys.content.bold.primary.regular}",
"$value": "{sys.bgcolor.inverse.pressed}",
"$description": "forms.radio.control.foreground.unselected.fill.pressed"
},
"focus": {
"$type": "color",
"$value": "{sys.content.bold.primary.regular}",
"$value": "{sys.bgcolor.inverse.rest}",
"$description": "forms.radio.control.foreground.unselected.fill.focus"
},
"disabled": {
"$type": "color",
"$value": "{sys.content.bold.disabled.regular}",
"$value": "{sys.bgcolor.inverse.disabled}",
"$description": "forms.radio.control.foreground.unselected.fill.disabled"
},
"error": {
"$type": "color",
"$value": "{sys.content.bold.primary.regular}",
"$value": "{sys.bgcolor.inverse.rest}",
"$description": "forms.radio.control.foreground.unselected.fill.error"
}
},
"active": {
"rest": {
"$type": "color",
"$value": "{sys.content.bold.primary.regular}",
"$description": "forms.radio.control.foreground.selected.fill.rest"
"$value": "{sys.bgcolor.inverse.rest}",
"$description": "forms.radio.control.foreground.unselected.fill.rest"
},
"hover": {
"$type": "color",
"$value": "{sys.content.bold.primary.regular}",
"$description": "forms.radio.control.foreground.selected.fill.hover"
"$value": "{sys.bgcolor.inverse.hover}",
"$description": "forms.radio.control.foreground.unselected.fill.hover"
},
"pressed": {
"$type": "color",
"$value": "{sys.content.bold.primary.regular}",
"$description": "forms.radio.control.foreground.selected.fill.pressed"
"$value": "{sys.bgcolor.inverse.pressed}",
"$description": "forms.radio.control.foreground.unselected.fill.pressed"
},
"focus": {
"$type": "color",
"$value": "{sys.content.bold.primary.regular}",
"$description": "forms.radio.control.foreground.selected.fill.focus"
"$value": "{sys.bgcolor.inverse.rest}",
"$description": "forms.radio.control.foreground.unselected.fill.focus"
},
"disabled": {
"$type": "color",
"$value": "{sys.content.bold.disabled.regular}",
"$description": "forms.radio.control.foreground.selected.fill.disabled"
"$value": "{sys.bgcolor.inverse.disabled}",
"$description": "forms.radio.control.foreground.unselected.fill.disabled"
},
"error": {
"$type": "color",
"$value": "{sys.content.bold.primary.regular}",
"$value": "{sys.bgcolor.inverse.rest}",
"$description": "forms.radio.control.foreground.unselected.fill.error"
}
}
Expand Down
10 changes: 9 additions & 1 deletion packages/figma-design-tokens/input/tokens/cmp/shadows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,18 @@
"elevation": {
"elevated": {
"$type": "boxShadow",
"$value": "{sem.elevation.lvl_1}"
"$value": "{sys.elevation.lvl_1}"
}
}
}
},
"menu": {
"container": {
"elevation": {
"$type": "boxShadow",
"$value": "{sys.elevation.lvl_1}"
}
}
}
}
}
Loading
Loading