Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

S2 Action Bar and Checkbox values #457

Merged
merged 3 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions .changeset/cool-eyes-nail.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
---
"@adobe/spectrum-tokens": minor
---

## Design Motivation

- Updated desktop and mobile values for checkbox-control-size-[size] and checkbox-top-to-control-[size] tokens
- Made token changes required for the S2 action bar update

## Tokens Diff

**Tokens Changed (10)**

<details open><summary>Added (2)</summary>

- `action-bar-minimum-width`
- `action-bar-label-to-action-group-area`

</details>

Updated (8)

<details open><summary>Updated Properties (8)</summary>

- `checkbox-control-size-small`
- `desktop.value`: `12px` -> `14px`
- `mobile.value`: `16px` -> `18px`
- `checkbox-control-size-medium`
- `desktop.value`: `14px` -> `16px`
- `mobile.value`: `18px` -> `20px`
- `checkbox-control-size-large`
- `desktop.value`: `16px` -> `18px`
- `mobile.value`: `20px` -> `22px`
- `checkbox-control-size-extra-large`
- `desktop.value`: `18px` -> `20px`
- `mobile.value`: `22px` -> `26px`
- `checkbox-top-to-control-small`
- `desktop.value`: `6px` -> `5px`
- `mobile.value`: `7px` -> `6px`
- `checkbox-top-to-control-medium`
- `desktop.value`: `9px` -> `8px`
- `mobile.value`: `11px` -> `10px`
- `checkbox-top-to-control-large`
- `desktop.value`: `12px` -> `11px`
- `mobile.value`: `15px` -> `14px`
- `checkbox-top-to-control-extra-large`
- `desktop.value`: `15px` -> `14px`
- `mobile.value`: `19px` -> `17px`

</details>
27 changes: 27 additions & 0 deletions docs/site/public/schemas/token-types/gradient-stop.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/gradient-stop.json",
"title": "Color Stop",
"description": "Gradient stop positions, being a ratio along the gradient's axis. Start is 0, end is 1.",
"type": "object",
"allOf": [
{
"$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/token.json"
}
],
"properties": {
"$schema": {
"const": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/gradient-stop.json"
},
"value": {
"type": "number",
"minimum": 0,
"maximum": 1
},
"component": {},
"private": {},
"deprecated": {},
"deprecated_comment": {},
"uuid": {}
}
}
2 changes: 1 addition & 1 deletion docs/site/public/schemas/token-types/multiplier.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"const": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/multiplier.json"
},
"value": {
"type": "string",
"type": "number",
"pattern": "^(?:\\d+\\.?\\d*)|(?:\\.?\\d+)$"
},
"component": {},
Expand Down
27 changes: 27 additions & 0 deletions docs/site/public/schemas/token-types/text-align.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/text-align.json",
"title": "Text align",
"description": "Sets the horizontal alignment of the inline-level content inside a block element",
"type": "object",
"allOf": [
{
"$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/token.json"
}
],
"properties": {
"$schema": {
"const": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/text-align.json"
},
"value": {
"type": "string",
"enum": ["start", "center", "end"],
"default": "start"
},
"component": {},
"private": {},
"deprecated": {},
"deprecated_comment": {},
"uuid": {}
}
}
9 changes: 8 additions & 1 deletion docs/site/public/schemas/token-types/token.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@
"type": "object",
"properties": {
"value": {
"type": "string"
"anyOf": [
{
"type": "number"
},
{
"type": "string"
}
]
},
"component": {
"type": "string"
Expand Down
44 changes: 28 additions & 16 deletions packages/tokens/src/layout-component.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"sets": {
"desktop": {
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "12px",
"value": "14px",
"uuid": "460e8170-de69-4f8e-8420-6c87a1f6f5cd"
},
"mobile": {
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "16px",
"value": "18px",
"uuid": "af31c1a5-ffce-4a54-8862-3e711ca53d25"
}
}
Expand All @@ -21,12 +21,12 @@
"sets": {
"desktop": {
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "14px",
"value": "16px",
"uuid": "86288454-7192-4e4c-b55f-fc509fc58c01"
},
"mobile": {
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "18px",
"value": "20px",
"uuid": "00fee3f7-a743-45d6-a2b6-028d5d96964a"
}
}
Expand All @@ -37,12 +37,12 @@
"sets": {
"desktop": {
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "16px",
"value": "18px",
"uuid": "839a52bc-b9ee-473f-acde-0799b4f55ded"
},
"mobile": {
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "20px",
"value": "22px",
"uuid": "b4367578-989e-438d-9a3e-7cb077f2f7c9"
}
}
Expand All @@ -53,12 +53,12 @@
"sets": {
"desktop": {
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "18px",
"value": "20px",
"uuid": "4ba47ba1-c9bd-447e-8948-009d5b424e0d"
},
"mobile": {
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "22px",
"value": "26px",
"uuid": "13093f8b-e38e-449f-a982-7f960bb84dfa"
}
}
Expand All @@ -69,12 +69,12 @@
"sets": {
"desktop": {
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "6px",
"value": "5px",
"uuid": "20518175-5bc7-4659-8007-e74339c39433"
},
"mobile": {
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "7px",
"value": "6px",
"uuid": "f254146e-f469-44b1-b0c9-1ac72e88f9e3"
}
}
Expand All @@ -85,12 +85,12 @@
"sets": {
"desktop": {
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "9px",
"value": "8px",
"uuid": "dcde5d2d-60f8-4d56-bfb1-bba44a087515"
},
"mobile": {
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "11px",
"value": "10px",
"uuid": "e3751526-2db9-421c-85f9-d60071aac49b"
}
}
Expand All @@ -101,12 +101,12 @@
"sets": {
"desktop": {
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "12px",
"value": "11px",
"uuid": "93edae08-5320-4e7e-a006-a9af1d3665ad"
},
"mobile": {
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "15px",
"value": "14px",
"uuid": "d040d2f4-9bb4-4d27-adac-40fef079d958"
}
}
Expand All @@ -117,12 +117,12 @@
"sets": {
"desktop": {
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "15px",
"value": "14px",
"uuid": "3c4217bb-91f2-4347-9f65-a0528992f600"
},
"mobile": {
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "19px",
"value": "17px",
"uuid": "b3be5ac8-2415-4490-8b4a-c08661ec84d1"
}
}
Expand Down Expand Up @@ -10468,5 +10468,17 @@
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/opacity.json",
"value": "0.15",
"uuid": "a83e023c-dc92-4b3e-8375-351bbf8ec9bb"
},
"action-bar-minimum-width": {
"component": "action-bar",
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json",
"value": "176px",
"uuid": "9fb582b4-38e6-43d0-9b94-69964fb24c9f"
},
"action-bar-label-to-action-group-area": {
"component": "action-bar",
"$schema": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/alias.json",
"value": "{spacing-300}",
"uuid": "72e276ce-d6ee-4bcf-9955-91c833b8b2cd"
}
}
Loading