Skip to content

Commit

Permalink
Merge pull request #4290 from grommet/figma-fix
Browse files Browse the repository at this point in the history
Sync tokens with Figma
  • Loading branch information
taysea authored Oct 28, 2024
2 parents 49249ba + e2f17d4 commit 0d425fe
Show file tree
Hide file tree
Showing 3 changed files with 351 additions and 315 deletions.
6 changes: 3 additions & 3 deletions design-tokens/tokens/component/component.default.json
Original file line number Diff line number Diff line change
Expand Up @@ -1568,7 +1568,7 @@
},
"paddingY": {
"$type": "number",
"$value": 4,
"$value": 3,
"$description": "",
"$extensions": {
"com.figma": {
Expand Down Expand Up @@ -1764,7 +1764,7 @@
},
"paddingY": {
"$type": "number",
"$value": 4,
"$value": 3,
"$description": "",
"$extensions": {
"com.figma": {
Expand Down Expand Up @@ -7080,7 +7080,7 @@
"$extensions": {
"com.figma": {
"hiddenFromPublishing": false,
"scopes": ["GAP"],
"scopes": ["WIDTH_HEIGHT"],
"codeSyntax": {}
}
}
Expand Down
1 change: 1 addition & 0 deletions sandbox/grommet-app/src/theme.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,7 @@ const buildTheme = tokens => {
},
},
button: {
intelligentPad: false,
badge: {
align: 'container', // TO DO this is a grommet-ism?
container: {
Expand Down
Loading

0 comments on commit 0d425fe

Please sign in to comment.