Skip to content

feat(themes): add semantic control radius tokens #577

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.

Sign up for GitHub

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

Closed
aralston wants to merge 1 commit into from
Closed

feat(themes): add semantic control radius tokens #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions packages/reshaped/src/components/Button/Button.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
--rs-button-line-height: var(--rs-line-height-body-3);
--rs-button-font-size: var(--rs-font-size-body-3);
--rs-button-letter-spacing: var(--rs-letter-spacing-body-3);
--rs-button-radius: var(--rs-radius-small);
--rs-button-radius: var(--rs-radius-control-small);
}

@value medium {
Expand All @@ -147,7 +147,7 @@
--rs-button-line-height: var(--rs-line-height-body-3);
--rs-button-font-size: var(--rs-font-size-body-3);
--rs-button-letter-spacing: var(--rs-letter-spacing-body-3);
--rs-button-radius: var(--rs-radius-small);
--rs-button-radius: var(--rs-radius-control-medium);
}

@value large {
Expand All @@ -157,7 +157,7 @@
--rs-button-line-height: var(--rs-line-height-body-2);
--rs-button-font-size: var(--rs-font-size-body-2);
--rs-button-letter-spacing: var(--rs-letter-spacing-body-2);
--rs-button-radius: var(--rs-radius-medium);
--rs-button-radius: var(--rs-radius-control-large);
}

@value xlarge {
Expand All @@ -167,7 +167,7 @@
--rs-button-line-height: var(--rs-line-height-body-2);
--rs-button-font-size: var(--rs-font-size-body-2);
--rs-button-letter-spacing: var(--rs-letter-spacing-body-2);
--rs-button-radius: var(--rs-radius-medium);
--rs-button-radius: var(--rs-radius-control-xlarge);
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/reshaped/src/components/MenuItem/MenuItem.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ button.root {
@value small {
--rs-p-v: var(--rs-unit-x1);
--rs-p-h: var(--rs-unit-x2);
--rs-menu-item-radius: var(--rs-radius-small);
--rs-menu-item-radius: var(--rs-radius-control-small);

font-size: var(--rs-font-size-body-3);
line-height: var(--rs-line-height-body-3);
Expand All @@ -53,7 +53,7 @@ button.root {
@value medium {
--rs-p-v: var(--rs-unit-x2);
--rs-p-h: var(--rs-unit-x3);
--rs-menu-item-radius: var(--rs-radius-small);
--rs-menu-item-radius: var(--rs-radius-control-medium);

font-size: var(--rs-font-size-body-3);
line-height: var(--rs-line-height-body-3);
Expand All @@ -63,7 +63,7 @@ button.root {
@value large {
--rs-p-v: var(--rs-unit-x3);
--rs-p-h: var(--rs-unit-x4);
--rs-menu-item-radius: var(--rs-radius-medium);
--rs-menu-item-radius: var(--rs-radius-control-large);

font-size: var(--rs-font-size-body-2);
line-height: var(--rs-line-height-body-2);
Expand Down
8 changes: 4 additions & 4 deletions packages/reshaped/src/components/Select/Select.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
@value small {
--rs-select-gap: var(--rs-unit-x2);
--rs-select-chevron-size: var(--rs-unit-x4);
--rs-select-radius: var(--rs-radius-small);
--rs-select-radius: var(--rs-radius-control-small);

& .input {
padding-block: var(--rs-unit-x1);
Expand All @@ -118,7 +118,7 @@
@value medium {
--rs-select-gap: var(--rs-unit-x2);
--rs-select-chevron-size: var(--rs-unit-x4);
--rs-select-radius: var(--rs-radius-small);
--rs-select-radius: var(--rs-radius-control-medium);

& .input {
padding-block: var(--rs-unit-x2);
Expand All @@ -131,7 +131,7 @@
@value large {
--rs-select-gap: var(--rs-unit-x3);
--rs-select-chevron-size: var(--rs-unit-x5);
--rs-select-radius: var(--rs-radius-medium);
--rs-select-radius: var(--rs-radius-control-large);

& .input {
padding-block: var(--rs-unit-x3);
Expand All @@ -144,7 +144,7 @@
@value xlarge {
--rs-select-gap: var(--rs-unit-x4);
--rs-select-chevron-size: var(--rs-unit-x5);
--rs-select-radius: var(--rs-radius-medium);
--rs-select-radius: var(--rs-radius-control-xlarge);

& .input {
padding-block: var(--rs-unit-x4);
Expand Down
8 changes: 4 additions & 4 deletions packages/reshaped/src/components/TextArea/TextArea.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
z-index: 1;
color: var(--rs-color-foreground-neutral);
background: var(--rs-color-background-elevation-base);
border-radius: var(--rs-radius-small);
border-radius: var(--rs-radius-control-medium);
box-shadow: 0 0 0 var(--rs-textarea-border-width) var(--rs-textarea-border-color) inset;

&:focus {
Expand All @@ -54,7 +54,7 @@
--rs-p: var(--rs-unit-x2);

& .input {
border-radius: var(--rs-radius-small);
border-radius: var(--rs-radius-control-medium);
font-size: var(--rs-font-size-body-3);
line-height: var(--rs-line-height-body-3);
letter-spacing: var(--rs-letter-spacing-body-3);
Expand All @@ -65,7 +65,7 @@
--rs-p: var(--rs-unit-x3);

& .input {
border-radius: var(--rs-radius-medium);
border-radius: var(--rs-radius-control-large);
font-size: var(--rs-font-size-body-2);
line-height: var(--rs-line-height-body-2);
letter-spacing: var(--rs-letter-spacing-body-2);
Expand All @@ -76,7 +76,7 @@
--rs-p: var(--rs-unit-x4);

& .input {
border-radius: var(--rs-radius-medium);
border-radius: var(--rs-radius-control-xlarge);
font-size: var(--rs-font-size-body-2);
line-height: var(--rs-line-height-body-2);
letter-spacing: var(--rs-letter-spacing-body-2);
Expand Down
8 changes: 4 additions & 4 deletions packages/reshaped/src/components/TextField/TextField.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
@responsive .--size {
@value small {
--rs-text-field-gap: var(--rs-unit-x2);
--rs-text-field-radius: var(--rs-radius-small);
--rs-text-field-radius: var(--rs-radius-control-small);
--rs-text-field-p-v: var(--rs-unit-x1);
--rs-text-field-font-size: var(--rs-font-size-body-3);
--rs-text-field-line-height: var(--rs-line-height-body-3);
Expand All @@ -167,7 +167,7 @@

@value medium {
--rs-text-field-gap: var(--rs-unit-x2);
--rs-text-field-radius: var(--rs-radius-small);
--rs-text-field-radius: var(--rs-radius-control-medium);
--rs-text-field-p-v: var(--rs-unit-x2);
--rs-text-field-font-size: var(--rs-font-size-body-3);
--rs-text-field-line-height: var(--rs-line-height-body-3);
Expand All @@ -178,7 +178,7 @@

@value large {
--rs-text-field-gap: var(--rs-unit-x3);
--rs-text-field-radius: var(--rs-radius-medium);
--rs-text-field-radius: var(--rs-radius-control-large);
--rs-text-field-p-v: var(--rs-unit-x3);
--rs-text-field-font-size: var(--rs-font-size-body-2);
--rs-text-field-line-height: var(--rs-line-height-body-2);
Expand All @@ -189,7 +189,7 @@

@value xlarge {
--rs-text-field-gap: var(--rs-unit-x4);
--rs-text-field-radius: var(--rs-radius-medium);
--rs-text-field-radius: var(--rs-radius-control-xlarge);
--rs-text-field-p-v: var(--rs-unit-x4);
--rs-text-field-font-size: var(--rs-font-size-body-2);
--rs-text-field-line-height: var(--rs-line-height-body-2);
Expand Down
31 changes: 23 additions & 8 deletions packages/reshaped/src/themes/_generator/tokens/radius/radius.transforms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
import { getVariableName } from "../css";

import type * as T from "./radius.types";
import type { Transformer } from "../types";

const transformToken: Transformer<T.Token> = (name, token) => [
{
name,
tokenType: "radius",
type: "variable",
value: `${token.px}px`,
},
];
const transformToken: Transformer<T.Token> = (name, token) => {
if ("radiusToken" in token) {
return [
{
name,
tokenType: "radius",
type: "variable",
value: `var(${getVariableName(token.radiusToken, "radius")})`,
},
];
}

return [
{
name,
tokenType: "radius",
type: "variable",
value: `${token.px}px`,
},
];
};

export default transformToken;
12 changes: 10 additions & 2 deletions packages/reshaped/src/themes/_generator/tokens/radius/radius.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
export type Name = "small" | "medium" | "large";
export type Token = { px: number };
export type Name =
| "small"
| "medium"
| "large"
| "control-small"
| "control-medium"
| "control-large"
| "control-xlarge";

export type Token = { px: number } | { radiusToken: string };
12 changes: 12 additions & 0 deletions packages/reshaped/src/themes/figma/theme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,18 @@
},
"large": {
"px": 12
},
"control-small": {
"radiusToken": "small"
},
"control-medium": {
"radiusToken": "small"
},
"control-large": {
"radiusToken": "medium"
},
"control-xlarge": {
"radiusToken": "medium"
}
},
"color": {
Expand Down
12 changes: 12 additions & 0 deletions packages/reshaped/src/themes/reshaped/theme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,18 @@
},
"large": {
"px": 12
},
"control-small": {
"radiusToken": "small"
},
"control-medium": {
"radiusToken": "small"
},
"control-large": {
"radiusToken": "medium"
},
"control-xlarge": {
"radiusToken": "medium"
}
},
"color": {
Expand Down
12 changes: 12 additions & 0 deletions packages/reshaped/src/themes/slate/theme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,18 @@
},
"large": {
"px": 12
},
"control-small": {
"radiusToken": "small"
},
"control-medium": {
"radiusToken": "small"
},
"control-large": {
"radiusToken": "medium"
},
"control-xlarge": {
"radiusToken": "medium"
}
},
"color": {
Expand Down
Loading