Skip to content

Commit

Permalink
Merge branch 'main' into gj-fix-broken-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
gjones authored Sep 12, 2023
2 parents 3b06bb4 + b602011 commit a68cf7e
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
10 changes: 5 additions & 5 deletions tokens/themes/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@
"type": "spacing"
},
"y": {
"value": "0.34375rem",
"value": "0.28125rem",
"type": "spacing"
},
"gap": {
Expand Down Expand Up @@ -510,11 +510,11 @@
"default": {
"space": {
"x": {
"value": "{spaces.2}",
"value": "{click.button.iconButton.default.space.y}",
"type": "spacing"
},
"y": {
"value": "{spaces.2}",
"value": "0.4375rem",
"type": "spacing"
}
}
Expand Down Expand Up @@ -572,7 +572,7 @@
"icon": {
"space": {
"y": {
"value": "0.515625rem",
"value": "0.4375rem",
"type": "spacing"
},
"x": {
Expand Down Expand Up @@ -1178,7 +1178,7 @@
"type": "spacing"
},
"y": {
"value": "0.34375rem",
"value": "0.28125rem",
"type": "spacing"
},
"gap": {
Expand Down
2 changes: 1 addition & 1 deletion tokens/themes/dark.json
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@
"studio.tokens": {
"modify": {
"type": "lighten",
"value": "0.075",
"value": "0.080",
"space": "lch"
}
}
Expand Down
11 changes: 10 additions & 1 deletion tokens/themes/light.json
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,16 @@
"background": {
"default": {
"value": "{palette.slate.100}",
"type": "color"
"type": "color",
"$extensions": {
"studio.tokens": {
"modify": {
"type": "lighten",
"value": "0.35",
"space": "lch"
}
}
}
},
"hover": {
"value": "{palette.slate.50}",
Expand Down

0 comments on commit a68cf7e

Please sign in to comment.