Skip to content

Commit

Permalink
Merge branch 'main' into karstens/fix--newline-end-of-file
Browse files Browse the repository at this point in the history
* main: (22 commits)
  [create-pull-request] automated change
  Fixed detail-cjk-size-s value
  Corrected name values
  Removed duplicate UUID
  [create-pull-request] automated change
  Added segmented-control-selection-border-width
  Added tokens for mobile
  copying color updates from s2 to s2-foundations
  Added segmented-control-item-height
  removed darkest from foundations
  Update PULL_REQUEST_TEMPLATE.md
  Added tokens
  Updated tokens
  Added tokens
  fix: removed 'darkest' from tokens studio metadata file
  feat: s2 foundation data set
  Updated tokens
  Updated tokens
  Added and updated tokens for mobile
  Add two new tokens and update one. New tokens have no UUID values
  ...
  • Loading branch information
karstens committed Sep 4, 2024
2 parents f66b63f + c8a944c commit 3220051
Show file tree
Hide file tree
Showing 43 changed files with 38,287 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--- Title: Provide a general summary of your changes in the Title above -->
<!--- Reviewers: All members of the Spectrum Design Data team are included by default. Tag individuals in your Slack review request message instead. -->
<!--- Reviewers: Add reviewers to your PR (@GarthDB, @karstens, @larz0, @lynnhao, @PaliwalSparsh, @mrcjhicks) and tag them in your Slack review request message -->
<!--- Approval: PRs require two reviews at the minimum (one from the engineering team and one from the design team) in order to be considered "approved" and ready to merge -->

## Description
Expand Down
32 changes: 32 additions & 0 deletions src/tokens-studio/foundations/$metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"tokenSetOrder": [
"spectrum/palette/light",
"spectrum/palette/dark",
"spectrum/palette/wireframe",
"spectrum/alias/light",
"spectrum/alias/dark",
"spectrum/alias/wireframe",
"spectrum/icon/light",
"spectrum/icon/dark",
"spectrum/icon/wireframe",
"spectrum/component/light",
"spectrum/component/dark",
"spectrum/component/wireframe",
"spectrum/opacity.alias/light",
"spectrum/opacity.alias/dark",
"spectrum/opacity.alias/wireframe",
"spectrum/opacity.component/light",
"spectrum/opacity.component/dark",
"spectrum/opacity.component/wireframe",
"spectrum/icon/desktop",
"spectrum/icon/mobile",
"spectrum/layout/desktop",
"spectrum/layout/mobile",
"spectrum/layout.component/desktop",
"spectrum/layout.component/mobile",
"spectrum/typography/desktop",
"spectrum/typography/mobile",
"spectrum/typography.component/desktop",
"spectrum/typography.component/mobile"
]
}
88 changes: 88 additions & 0 deletions src/tokens-studio/foundations/$themes.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
[
{
"id": "738333a3145b5fb23c20797c93ee780d037a11d5",
"name": "light",
"selectedTokenSets": {
"spectrum/palette/light": "enabled",
"spectrum/alias/light": "enabled",
"spectrum/component/light": "enabled",
"spectrum/icon/light": "enabled"
},
"group": "S.Color-theme"
},
{
"id": "51d38b3af725b927e3fba235fa6c3bb6cfcaf59e",
"name": "dark",
"selectedTokenSets": {
"spectrum/palette/dark": "enabled",
"spectrum/alias/dark": "enabled",
"spectrum/component/dark": "enabled",
"spectrum/icon/dark": "enabled"
},
"group": "S.Color-theme"
},
{
"id": "c9bc639cbf2113e23ab199cc67f78dd936c8d66a",
"name": "wireframe",
"selectedTokenSets": {
"spectrum/palette/wireframe": "enabled",
"spectrum/alias/wireframe": "enabled",
"spectrum/component/wireframe": "enabled",
"spectrum/icon/wireframe": "enabled"
},
"group": "S.Color-theme"
},
{
"id": "2083d14f7264328dfb689d5991f27a55c9069440",
"name": "mobile",
"$figmaStyleReferences": {},
"selectedTokenSets": {
"spectrum/icon/mobile": "enabled",
"spectrum/layout/mobile": "enabled",
"spectrum/layout.component/mobile": "enabled",
"spectrum/typography/mobile": "enabled",
"spectrum/typography.component/mobile": "enabled"
},
"group": "S.Scale"
},
{
"id": "12629b2474b904be31cfd0ec84ae76e92c88576e",
"name": "desktop",
"$figmaStyleReferences": {},
"selectedTokenSets": {
"spectrum/icon/desktop": "enabled",
"spectrum/layout/desktop": "enabled",
"spectrum/layout.component/desktop": "enabled",
"spectrum/typography/desktop": "enabled",
"spectrum/typography.component/desktop": "enabled"
},
"group": "S.Scale"
},
{
"id": "738333a3145b5fb23c20797c93ee780d037a11d5",
"name": "light",
"selectedTokenSets": {
"spectrum/opacity.alias/light": "enabled",
"spectrum/opacity.component/light": "enabled"
},
"group": "S.Color-theme"
},
{
"id": "51d38b3af725b927e3fba235fa6c3bb6cfcaf59e",
"name": "dark",
"selectedTokenSets": {
"spectrum/opacity.alias/dark": "enabled",
"spectrum/opacity.component/dark": "enabled"
},
"group": "S.Color-theme"
},
{
"id": "c9bc639cbf2113e23ab199cc67f78dd936c8d66a",
"name": "wireframe",
"selectedTokenSets": {
"spectrum/opacity.alias/wireframe": "enabled",
"spectrum/opacity.component/wireframe": "enabled"
},
"group": "S.Color-theme"
}
]
Loading

0 comments on commit 3220051

Please sign in to comment.