Skip to content

Commit

Permalink
feat(data): 1. Update descriptions in varius border radius tokens. 2.…
Browse files Browse the repository at this point in the history
… Add new border radius tokens to container and form. 3. Remove portrait border radius token from form, and add to profile. 4. Remove link and skiplink border radius tokens from focus, and add them to link. 5. Rename badge border radius token from circle to badge. 6. Reorder various border radius tokens to be alphabetical.
  • Loading branch information
clairedenning committed Feb 6, 2024
1 parent e974606 commit b672e39
Show file tree
Hide file tree
Showing 10 changed files with 97 additions and 46 deletions.
2 changes: 1 addition & 1 deletion data/tokens/Components/badge.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
}
},
"borderradius": {
"circle": {
"badge": {
"value": "{global.border-radius.circle}",
"type": "borderRadius",
"description": "Badge"
Expand Down
40 changes: 37 additions & 3 deletions data/tokens/Components/container.json
Original file line number Diff line number Diff line change
Expand Up @@ -293,15 +293,25 @@
"type": "borderRadius",
"description": "Carousel (parent container), "
},
"dialog": {
"value": "{global.border-radius.container.L}",
"type": "borderRadius",
"description": "Dialog"
},
"filepreview": {
"value": "{global.border-radius.container.L}",
"type": "borderRadius",
"description": "File preview (parent container), "
},
"note": {
"value": "{global.border-radius.container.M}",
"type": "borderRadius",
"description": "Note"
},
"preview": {
"value": "{global.border-radius.container.M}",
"linkpreview": {
"value": "{global.border-radius.interactive.M}",
"type": "borderRadius",
"description": "Carousel (slide), Link preview"
"description": "Link preview (outer corners)"
},
"subscriptiontile": {
"value": "{global.border-radius.container.M}",
Expand All @@ -318,6 +328,18 @@
"type": "borderRadius",
"description": "Tooltip\n"
},
"card": {
"moderate": {
"value": "{global.border-radius.interactive.M}",
"type": "borderRadius",
"description": "Card (less rounded)"
},
"curved": {
"value": "{global.border-radius.interactive.L}",
"type": "borderRadius",
"description": "Card (more rounded)"
}
},
"skeleton": {
"rectangle": {
"value": "{global.border-radius.container.M}",
Expand All @@ -329,6 +351,18 @@
"type": "borderRadius",
"description": "Skeleton (circle)"
}
},
"tile": {
"moderate": {
"value": "{global.border-radius.container.M}",
"type": "borderRadius",
"description": "Tile (less rounded)"
},
"curved": {
"value": "{global.border-radius.container.L}",
"type": "borderRadius",
"description": "Tile (more rounded)"
}
}
},
"space": {
Expand Down
12 changes: 0 additions & 12 deletions data/tokens/Components/focus.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,5 @@
"description": "focus black underline on links and skiplink"
}
}
},
"borderradius": {
"link": {
"value": "{global.border-radius.container.XS}",
"type": "borderRadius",
"description": "Link (focus bg corners and bottom corners of focus underline)"
},
"skiplink": {
"value": "{global.border-radius.container.M}",
"type": "borderRadius",
"description": "Skiplink (right corners of focus bg and border)"
}
}
}
31 changes: 13 additions & 18 deletions data/tokens/Components/form.json
Original file line number Diff line number Diff line change
Expand Up @@ -444,31 +444,21 @@
"type": "borderRadius",
"description": "Text editor (internal corners)"
},
"dialog": {
"value": "{global.border-radius.container.L}",
"fileupload": {
"value": "{global.border-radius.container.S}",
"type": "borderRadius",
"description": "Dialog\n"
"description": "File input (file uploads)"
},
"fileselector": {
"value": "{global.border-radius.container.S}",
"type": "borderRadius",
"description": "File preview (file selector asset)"
},
"input": {
"value": "{global.border-radius.interactive.S}",
"type": "borderRadius",
"description": "Checkbox, Date picker input, Date range input, Dropdown select (trigger), Search, File input (draggable area), Text area, Text input"
},
"validationbar": {
"value": "{global.border-radius.interactive.XS}",
"type": "borderRadius",
"description": "Validation bar"
},
"portrait": {
"value": "{global.border-radius.circle}",
"type": "borderRadius",
"description": "Portrait"
},
"preview": {
"value": "{global.border-radius.container.S}",
"type": "borderRadius",
"description": "File input (file uploads), Link preview"
},
"radio": {
"value": "{global.border-radius.circle}",
"type": "borderRadius",
Expand All @@ -479,6 +469,11 @@
"type": "borderRadius",
"description": "Switch container and handle"
},
"validationbar": {
"value": "{global.border-radius.interactive.XS}",
"type": "borderRadius",
"description": "Validation bar"
},
"calendar": {
"none": {
"value": "{global.border-radius.none}",
Expand Down
12 changes: 12 additions & 0 deletions data/tokens/Components/link.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,18 @@
"type": "sizing"
}
}
},
"borderradius": {
"link": {
"value": "{global.border-radius.interactive.XS}",
"type": "borderRadius",
"description": "Link (focus bg and bottom corners of focus underline)"
},
"skiplink": {
"value": "{global.border-radius.interactive.M}",
"type": "borderRadius",
"description": "Skiplink (right corners of focus bg and border)"
}
}
}
}
10 changes: 10 additions & 0 deletions data/tokens/Components/nav.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,20 @@
}
},
"borderradius": {
"menu": {
"value": "{global.border-radius.interactive.M}",
"type": "borderRadius",
"description": "Menu (bottom corners), "
},
"menuitem": {
"value": "{global.border-radius.interactive.S}",
"type": "borderRadius",
"description": "Menu (menu item state bg shape), "
},
"navigationleft": {
"value": "{global.border-radius.interactive.L}",
"type": "borderRadius",
"description": "Navigation left (collapsible Assets/Menu select top-right and bottom-right corners)"
}
}
}
Expand Down
7 changes: 7 additions & 0 deletions data/tokens/Components/profile.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@
"type": "color"
}
}
},
"borderradius": {
"portrait": {
"value": "{global.border-radius.circle}",
"type": "borderRadius",
"description": "Portrait"
}
}
}
}
9 changes: 7 additions & 2 deletions data/tokens/Components/progress.json
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,17 @@
"type": "borderRadius",
"description": "File input (bottom corners of integrated status bar)"
},
"scrollbar": {
"value": "{global.border-radius.circle}",
"type": "borderRadius",
"description": "Scrollbar"
},
"stepflow": {
"value": "{global.border-radius.circle}",
"type": "borderRadius",
"description": "Step flow (step indicators)"
},
"standalone": {
"bar": {
"S": {
"value": "{global.border-radius.container.XS}",
"type": "borderRadius",
Expand All @@ -199,7 +204,7 @@
"M": {
"value": "{global.border-radius.container.S}",
"type": "borderRadius",
"description": "File input (bottom corners of integrated status bar), Progress tracker M, Scrollbar"
"description": "File input (bottom corners of integrated status bar), Progress tracker M, "
},
"L": {
"value": "{global.border-radius.container.M}",
Expand Down
2 changes: 1 addition & 1 deletion data/tokens/Components/table.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
"container": {
"value": "{global.border-radius.container.M}",
"type": "borderRadius",
"description": "📦Table (parent container)"
"description": "Table (parent container)"
}
}
},
Expand Down
18 changes: 9 additions & 9 deletions data/tokens/global/radius.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,44 +25,44 @@
"XS": {
"value": "{origin.dimension.25} * {global.border-radius.scale}",
"type": "borderRadius",
"description": "TIGHT. Pill"
"description": "POINTED. Pill"
},
"S": {
"value": "{origin.dimension.50} * {global.border-radius.scale}",
"type": "borderRadius",
"description": "MODERATE. Color picker advanced (inner swatch container), File input (file uploads & integrated progress bar (bottom corners), Link preview, Tooltip."
"description": "SUBTLE. Color picker advanced (inner swatch container), File input (file uploads & integrated progress bar (bottom corners), Link preview, Tooltip."
},
"M": {
"value": "{origin.dimension.100} * {global.border-radius.scale}",
"type": "borderRadius",
"description": "GENTLE. Card select (single), Card select group (outer corners), Carousel (slides), File preview (File selector assets on left), Message, Note, Popover (menu container in Action popover, Button-split, Button-multi-action, Calendar, Dropdown), Subscription tile (currently a pattern), Table (parent container), Tile & Tile flexbox (less rounded), Toast"
"description": "MODERATE. Card select (single), Card select group (outer corners), Carousel (slides), File preview (File selector assets on left), Message, Note, Popover (menu container in Action popover, Button-split, Button-multi-action, Calendar, Dropdown), Subscription tile (currently a pattern), Table (parent container), Tile & Tile flexbox (less rounded), Toast"
},
"L": {
"value": "{origin.dimension.200} * {global.border-radius.scale}",
"type": "borderRadius",
"description": "SWEEPING. Carousel (parent container), Color picker advanced (parent container), Dialog (not full screen), File preview (parent container), Tile & Tile flexbox (more rounded)."
"description": "CURVED. Carousel (parent container), Color picker advanced (parent container), Dialog (not full screen), File preview (parent container), Tile & Tile flexbox (more rounded)."
}
},
"interactive": {
"XS": {
"value": "{origin.dimension.25} * {global.border-radius.scale}",
"type": "borderRadius",
"description": "TIGHT. Checkbox (S, M), Link (focus background and underline)"
"description": "POINTED. Checkbox (S, M), Link (focus background and underline)"
},
"S": {
"value": "{origin.dimension.50} * {global.border-radius.scale}",
"type": "borderRadius",
"description": "MODERATE. Checkbox L, Date picker input, Date range input, Dropdown select (trigger), File input (draggable area), Link (focus bg and underline bottom-right and bottom-left), Menu (state bg shape), Search, Text area, Text editor, Text input"
"description": "SUBTLE. Checkbox L, Date picker input, Date range input, Dropdown select (trigger), File input (draggable area), Link (focus bg and underline bottom-right and bottom-left), Menu (state bg shape), Search, Text area, Text editor, Text input"
},
"M": {
"value": "{origin.dimension.100} * {global.border-radius.scale}",
"type": "borderRadius",
"description": "GENTLE. Button subtle, Card (less rounded), Menu (bottom corners), Navigation: left (state bg shape), Skip focus, Tab, "
"description": "MODERATE. Button subtle, Card (less rounded), Menu (bottom corners), Navigation: left (state bg shape), Skip focus, Tab, "
},
"L": {
"value": "{origin.dimension.200} * {global.border-radius.scale}",
"type": "borderRadius",
"description": "SWEEPING. Buttons S (typical and destructive, and inc bar, split and multi), Card (more rounded), Navigation left (collapsible Assets/Menu select top-right and bottom-right corners), "
"description": "CURVED. Buttons S (typical and destructive, and inc bar, split and multi), Card (more rounded), Navigation left (collapsible Assets/Menu select top-right and bottom-right corners), "
},
"XL": {
"value": "{origin.dimension.250} * {global.border-radius.scale}",
Expand All @@ -72,7 +72,7 @@
"XXL": {
"value": "{origin.dimension.300} * {global.border-radius.scale}",
"type": "borderRadius",
"description": "ROUNDED. Buttons L (typical and destructive and inc bar split and multi), Button toggle L (parent container), "
"description": "SWEEPING. Buttons L (typical and destructive and inc bar split and multi), Button toggle L (parent container), "
}
}
}
Expand Down

1 comment on commit b672e39

@clairedenning
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In addition, removed form.borderradius.dialog token and added it to container. Renamed form.borderradius.preview to fileselector. Renamed progress.borderradius.standalone to bar. Added progress.borderradius.scrollbar.

Please sign in to comment.