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

feat: new font_face tokens and type tokens #92

Merged
merged 2 commits into from
Oct 1, 2024
Merged

feat: new font_face tokens and type tokens #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41a152a
feat: new font_face tokens and type tokens
Blackbaud-MattGregg Oct 1, 2024
22c9f17
remove unused src tokens, update name token to reference modern base
Blackbaud-MattGregg Oct 1, 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
18 changes: 8 additions & 10 deletions src/tokens/$themes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,6 @@
"size.illustration.m": "f8d2fba46308207768213b0fb72e1709234de3d2",
"size.illustration.l": "457ebedf9e1fb9bd0c3e851dc3b4287e515ab9c7",
"size.illustration.xl": "0e7151f599ec57b1f3987bb3057d77af7b79bd55",
"font.family.sans": "874afe7af47916e50c71922b692e6597ef3b9ba9",
"font.size.heading.1": "070dddf0cb355bb086fa3d2b7c7f7c3c7ef68b6e",
"font.size.heading.2": "1828086da36b38f0d72e36ea43131c2d38089c1f",
"font.size.heading.3": "f51544be494aa210472e9db2e281c030c36bd638",
Expand Down Expand Up @@ -371,7 +370,8 @@
"border.width.action.hover": "118140e5585da688e9cc9b8024252db33618c0b0",
"border.width.action.active": "cdd33f6934ab61b43ab6a325ea80760ecb3d2844",
"border.width.action.focus": "4b2dae44eeb9bdc3243e4b06cdd5eba6ebead644",
"border.width.action.selected.s": "0a0278650e64ac62260b91a8afbccc6196f995e3"
"border.width.action.selected.s": "0a0278650e64ac62260b91a8afbccc6196f995e3",
"font.family.primary": "874afe7af47916e50c71922b692e6597ef3b9ba9"
},
"group": "Layout"
},
Expand Down Expand Up @@ -465,7 +465,6 @@
"size.illustration.m": "f8d2fba46308207768213b0fb72e1709234de3d2",
"size.illustration.l": "457ebedf9e1fb9bd0c3e851dc3b4287e515ab9c7",
"size.illustration.xl": "0e7151f599ec57b1f3987bb3057d77af7b79bd55",
"font.family.sans": "874afe7af47916e50c71922b692e6597ef3b9ba9",
"font.size.heading.1": "070dddf0cb355bb086fa3d2b7c7f7c3c7ef68b6e",
"font.size.heading.2": "1828086da36b38f0d72e36ea43131c2d38089c1f",
"font.size.heading.3": "f51544be494aa210472e9db2e281c030c36bd638",
Expand Down Expand Up @@ -512,7 +511,8 @@
"border.width.action.hover": "118140e5585da688e9cc9b8024252db33618c0b0",
"border.width.action.active": "cdd33f6934ab61b43ab6a325ea80760ecb3d2844",
"border.width.action.focus": "4b2dae44eeb9bdc3243e4b06cdd5eba6ebead644",
"border.width.action.selected.s": "0a0278650e64ac62260b91a8afbccc6196f995e3"
"border.width.action.selected.s": "0a0278650e64ac62260b91a8afbccc6196f995e3",
"font.family.primary": "874afe7af47916e50c71922b692e6597ef3b9ba9"
},
"$figmaCollectionId": "VariableCollectionId:2142:337",
"$figmaModeId": "2142:2",
Expand Down Expand Up @@ -551,8 +551,6 @@
"space.inset.balanced.l": "f4aae0c5b31b8c6c91788ab6a8e453e81850e751",
"space.inset.balanced.xl": "3453889c8090d7bed31a8dc42eea469520c03ec5",
"size.icon.m": "d38fe1dbe02d11c78fa5abfe0fb4f7ac82523e3e",
"text.font_family": "745076bfeff31b64bad06c3123ca8c8b220ae2db",
"font.family.sans": "874afe7af47916e50c71922b692e6597ef3b9ba9",
"border.radius.s": "0d428f46ffd5535b399bd3f915fe386fad078ca1",
"border.radius.m": "c7d74f9be228681a6f6b469977987b3a5b8749c9",
"font.style.data_label": "97440c6826c119c30d42c1eac33a8ab695af4419",
Expand Down Expand Up @@ -671,7 +669,8 @@
"border.width.action.hover": "118140e5585da688e9cc9b8024252db33618c0b0",
"border.width.action.active": "cdd33f6934ab61b43ab6a325ea80760ecb3d2844",
"border.width.action.focus": "4b2dae44eeb9bdc3243e4b06cdd5eba6ebead644",
"border.width.action.selected.s": "0a0278650e64ac62260b91a8afbccc6196f995e3"
"border.width.action.selected.s": "0a0278650e64ac62260b91a8afbccc6196f995e3",
"font.family.primary": "874afe7af47916e50c71922b692e6597ef3b9ba9"
},
"group": "Layout"
},
Expand Down Expand Up @@ -712,8 +711,6 @@
"space.inset.balanced.l": "f4aae0c5b31b8c6c91788ab6a8e453e81850e751",
"space.inset.balanced.xl": "3453889c8090d7bed31a8dc42eea469520c03ec5",
"size.icon.m": "d38fe1dbe02d11c78fa5abfe0fb4f7ac82523e3e",
"text.font_family": "745076bfeff31b64bad06c3123ca8c8b220ae2db",
"font.family.sans": "874afe7af47916e50c71922b692e6597ef3b9ba9",
"border.radius.s": "0d428f46ffd5535b399bd3f915fe386fad078ca1",
"border.radius.m": "c7d74f9be228681a6f6b469977987b3a5b8749c9",
"font.style.data_label": "97440c6826c119c30d42c1eac33a8ab695af4419",
Expand Down Expand Up @@ -831,7 +828,8 @@
"border.width.action.hover": "118140e5585da688e9cc9b8024252db33618c0b0",
"border.width.action.active": "cdd33f6934ab61b43ab6a325ea80760ecb3d2844",
"border.width.action.focus": "4b2dae44eeb9bdc3243e4b06cdd5eba6ebead644",
"border.width.action.selected.s": "0a0278650e64ac62260b91a8afbccc6196f995e3"
"border.width.action.selected.s": "0a0278650e64ac62260b91a8afbccc6196f995e3",
"font.family.primary": "874afe7af47916e50c71922b692e6597ef3b9ba9"
}
}
]
42 changes: 18 additions & 24 deletions src/tokens/base-blackbaud.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,6 @@
"$value": "3.25rem"
}
},
"name": {
"$type": "fontFamilies",
"$value": "BLKB Sans"
},
"family": {
"monospaced": {
"$type": "fontFamilies",
"$value": "Menlo, Monaco, Consolas, Courier New, monospace"
},
"sans": {
"$type": "fontFamilies",
"$value": "{bb.font.name}, Helvetica Neue, Arial, sans-serif"
}
},
"weight": {
"light": {
"$type": "fontWeights",
Expand Down Expand Up @@ -105,16 +91,24 @@
"$value": "semibold italic"
}
},
"src": {
"sans": {
"regular": {
"$type": "other",
"$value": "url(\"https://sky.blackbaudcdn.net/static/skyux-fonts/2.0.0/assets/BLKBSans-Regular.woff\") format(\"woff\")"
},
"italic": {
"$type": "other",
"$value": "url(\"https://sky.blackbaudcdn.net/static/skyux-fonts/2.0.0/assets/BLKBSans-Italic.woff\") format(\"woff\")"
}
"blkb_sans": {
"name": {
"$type": "other",
"$value": "BLKB Sans"
},
"fallback": {
"$type": "other",
"$value": "Helvetica Neue, Arial, sans-serif"
},
"family": {
"$type": "other",
"$value": "{bb.font.blkb_sans.name}, {bb.font.blkb_sans.fallback}"
}
},
"monospaced": {
"family": {
"$type": "other",
"$value": "Menlo, Monaco, Consolas, Courier New, monospace"
}
}
},
Expand Down
30 changes: 22 additions & 8 deletions src/tokens/base-modern.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,14 +353,24 @@
"$value": "bold"
}
},
"name": {
"$type": "fontFamilies",
"$value": "BLKB Sans"
},
"family": {
"sans": {
"$type": "fontFamilies",
"$value": "{modern.font.name}, Helvetica Neue, Arial, sans-serif"
"monospaced": {
"family": {
"$type": "other",
"$value": "Menlo, Monaco, Consolas, Courier New, monospace"
}
},
"blkb_sans": {
"name": {
"$type": "other",
"$value": "BLKB Sans"
},
"fallback": {
"$type": "other",
"$value": "Helvetica Neue, Arial, sans-serif"
},
"family": {
"$type": "other",
"$value": "{modern.font.blkb_sans.name}, {modern.font.blkb_sans.fallback}"
}
}
},
Expand All @@ -377,6 +387,10 @@
"$type": "lineHeights",
"$value": "1.15"
},
"150": {
"$type": "lineHeights",
"$value": "1.5"
},
"normal": {
"$type": "lineHeights",
"$value": "normal"
Expand Down
Loading
Loading