Skip to content

Commit

Permalink
Merge branch 'cable/foundations-updates' of github.com:adobe/spectrum…
Browse files Browse the repository at this point in the history
…-tokens-studio-data into cable/foundations-updates
  • Loading branch information
mrcjhicks committed Jun 27, 2024
2 parents 85ca17d + 04145bb commit 21c94ef
Show file tree
Hide file tree
Showing 6 changed files with 126 additions and 66 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/sync-foundations.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: SYNC FOUNDATIONS

on:
workflow_dispatch

jobs:
check_should_run:
uses: ./.github/workflows/_diff-should-run.yml
secrets: inherit
diff_do:
needs: [check_should_run]
if: ${{ needs.check_should_run.outputs.condition == 'true' && (github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch')}}
uses: ./.github/workflows/_diff-trigger-sync.yml
with:
source: foundations # the tokens-studio data we want to compare (folder prefix in the repo)
branch: snapshot-s2-foundations # the spectrum-tokens data we want to compare (branch of the repo)
secrets: inherit
23 changes: 23 additions & 0 deletions .github/workflows/test-foundations.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: TEST FOUNDATIONS

on:
workflow_dispatch:
pull_request:
types: [opened, reopened, synchronize]
branches:
- main # only run on PRs targetting main
paths:
- 'src/tokens-studio/foundations/**' # only run when files in these paths change

jobs:
check_should_run:
uses: ./.github/workflows/_diff-should-run.yml
secrets: inherit
diff_test:
needs: [check_should_run]
if: ${{ needs.check_should_run.outputs.condition == 'true' }}
uses: ./.github/workflows/_diff-trigger-test.yml
with:
source: foundations # the tokens-studio data we want to compare (folder prefix in the repo)
branch: snapshot-s2-foundations # the spectrum-tokens data we want to compare (branch of the repo)
secrets: inherit
8 changes: 4 additions & 4 deletions src/tokens-studio/foundations/spectrum/icon/desktop.json
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@
}
},
"workflow-icon-size-100": {
"value": "18px",
"value": "20px",
"type": "sizing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -490,7 +490,7 @@
}
},
"workflow-icon-size-200": {
"value": "20px",
"value": "22px",
"type": "sizing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -500,7 +500,7 @@
}
},
"workflow-icon-size-300": {
"value": "22px",
"value": "26px",
"type": "sizing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -509,4 +509,4 @@
}
}
}
}
}
12 changes: 6 additions & 6 deletions src/tokens-studio/foundations/spectrum/icon/mobile.json
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@
}
},
"workflow-icon-size-50": {
"value": "18px",
"value": "16px",
"type": "sizing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -470,7 +470,7 @@
}
},
"workflow-icon-size-75": {
"value": "20px",
"value": "18px",
"type": "sizing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -480,7 +480,7 @@
}
},
"workflow-icon-size-100": {
"value": "22px",
"value": "24px",
"type": "sizing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -490,7 +490,7 @@
}
},
"workflow-icon-size-200": {
"value": "24px",
"value": "28px",
"type": "sizing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -500,7 +500,7 @@
}
},
"workflow-icon-size-300": {
"value": "28px",
"value": "30px",
"type": "sizing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -509,4 +509,4 @@
}
}
}
}
}
58 changes: 34 additions & 24 deletions src/tokens-studio/foundations/spectrum/layout/desktop.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
}
},
"component-edge-to-text-75": {
"value": "9px",
"value": "10px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand Down Expand Up @@ -180,7 +180,7 @@
}
},
"component-edge-to-text-300": {
"value": "18px",
"value": "17px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -190,7 +190,7 @@
}
},
"component-edge-to-visual-50": {
"value": "6px",
"value": "7px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -200,7 +200,7 @@
}
},
"component-edge-to-visual-75": {
"value": "7px",
"value": "8px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand Down Expand Up @@ -230,7 +230,7 @@
}
},
"component-edge-to-visual-300": {
"value": "15px",
"value": "14px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand Down Expand Up @@ -260,7 +260,7 @@
}
},
"component-edge-to-visual-only-100": {
"value": "7px",
"value": "6px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -270,7 +270,7 @@
}
},
"component-edge-to-visual-only-200": {
"value": "10px",
"value": "9px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -280,7 +280,7 @@
}
},
"component-edge-to-visual-only-300": {
"value": "13px",
"value": "11px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand Down Expand Up @@ -360,7 +360,7 @@
}
},
"component-pill-edge-to-text-75": {
"value": "12px",
"value": "13px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand Down Expand Up @@ -390,7 +390,7 @@
}
},
"component-pill-edge-to-text-300": {
"value": "24px",
"value": "23px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -400,7 +400,7 @@
}
},
"component-pill-edge-to-visual-75": {
"value": "10px",
"value": "11px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand Down Expand Up @@ -430,7 +430,7 @@
}
},
"component-pill-edge-to-visual-300": {
"value": "21px",
"value": "20px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -450,7 +450,7 @@
}
},
"component-pill-edge-to-visual-only-100": {
"value": "7px",
"value": "6px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -460,7 +460,7 @@
}
},
"component-pill-edge-to-visual-only-200": {
"value": "10px",
"value": "9px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -470,7 +470,7 @@
}
},
"component-pill-edge-to-visual-only-300": {
"value": "13px",
"value": "11px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand Down Expand Up @@ -590,7 +590,7 @@
}
},
"component-top-to-workflow-icon-100": {
"value": "7px",
"value": "6px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -600,7 +600,7 @@
}
},
"component-top-to-workflow-icon-200": {
"value": "10px",
"value": "9px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -610,7 +610,7 @@
}
},
"component-top-to-workflow-icon-300": {
"value": "13px",
"value": "11px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand Down Expand Up @@ -1450,7 +1450,7 @@
}
},
"text-to-visual-50": {
"value": "6px",
"value": "5px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -1460,7 +1460,7 @@
}
},
"text-to-visual-75": {
"value": "7px",
"value": "5px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -1470,7 +1470,7 @@
}
},
"text-to-visual-100": {
"value": "8px",
"value": "6px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -1480,7 +1480,7 @@
}
},
"text-to-visual-200": {
"value": "9px",
"value": "7px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -1490,7 +1490,7 @@
}
},
"text-to-visual-300": {
"value": "10px",
"value": "8px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
Expand All @@ -1499,6 +1499,16 @@
}
}
},
"text-to-visual-400": {
"value": "9px",
"type": "spacing",
"$extensions": {
"spectrum-tokens": {
"uuid": "3d393d59-b358-48a7-82c6-a7802408cd0d",
"name": "text-to-visual-400"
}
}
},
"text-underline-gap": {
"value": "1px",
"type": "spacing",
Expand Down Expand Up @@ -1749,4 +1759,4 @@
}
}
}
}
}
Loading

0 comments on commit 21c94ef

Please sign in to comment.