Skip to content

refactor: wire up design tokens in custom Tailwind focus utils #12348

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

Merged
jcfranco merged 1 commit into from
Jun 18, 2025
Merged

refactor: wire up design tokens in custom Tailwind focus utils #12348

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
10 changes: 5 additions & 5 deletions packages/calcite-components/tailwind.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ const config: Config = {
"outline-color": "transparent",
},
".focus-normal": {
outline: "2px solid var(--calcite-internal-color-focus)",
outline: "var(--calcite-border-width-md) solid var(--calcite-internal-color-focus)",
},
".focus-outset": {
outline: "2px solid var(--calcite-internal-color-focus)",
"outline-offset": invert("2px", "--calcite-offset-invert-focus"),
outline: "var(--calcite-border-width-md) solid var(--calcite-internal-color-focus)",
"outline-offset": invert("var(--calcite-spacing-base)", "--calcite-offset-invert-focus"),
},
".focus-inset": {
outline: "2px solid var(--calcite-internal-color-focus)",
"outline-offset": invert("-2px", "--calcite-offset-invert-focus"),
outline: "var(--calcite-border-width-md) solid var(--calcite-internal-color-focus)",
"outline-offset": invert("calc(-1 * var(--calcite-spacing-base))", "--calcite-offset-invert-focus"),
},
});
}),
Expand Down
21 changes: 12 additions & 9 deletions packages/calcite-tailwind-preset/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,23 +233,26 @@ const config: Omit<Config, "content"> = {
"outline-color": "transparent",
},
".focus-normal": {
outline: "2px solid var(--calcite-color-focus, var(--calcite-ui-focus-color, var(--calcite-color-brand)))",
outline:
"var(--calcite-border-width-md) solid var(--calcite-color-focus, var(--calcite-ui-focus-color, var(--calcite-color-brand)))",
},
".focus-outset": {
outline: "2px solid var(--calcite-color-focus, var(--calcite-ui-focus-color, var(--calcite-color-brand)))",
"outline-offset": invert("2px", "--calcite-offset-invert-focus"),
outline:
"var(--calcite-border-width-md) solid var(--calcite-color-focus, var(--calcite-ui-focus-color, var(--calcite-color-brand)))",
"outline-offset": invert("var(--calcite-spacing-base)", "--calcite-offset-invert-focus"),
},
".focus-inset": {
outline: "2px solid var(--calcite-color-focus, var(--calcite-ui-focus-color, var(--calcite-color-brand)))",
"outline-offset": invert("-2px", "--calcite-offset-invert-focus"),
outline:
"var(--calcite-border-width-md) solid var(--calcite-color-focus, var(--calcite-ui-focus-color, var(--calcite-color-brand)))",
"outline-offset": invert("calc(-1 * var(--calcite-spacing-base))", "--calcite-offset-invert-focus"),
},
".focus-outset-danger": {
outline: "2px solid var(--calcite-color-status-danger)",
"outline-offset": invert("2px", "--calcite-offset-invert-focus"),
outline: "var(--calcite-border-width-md) solid var(--calcite-color-status-danger)",
"outline-offset": invert("var(--calcite-spacing-base)", "--calcite-offset-invert-focus"),
},
".focus-inset-danger": {
outline: "2px solid var(--calcite-color-status-danger)",
"outline-offset": invert("-2px", "--calcite-offset-invert-focus"),
outline: "var(--calcite-border-width-md) solid var(--calcite-color-status-danger)",
"outline-offset": invert("calc(-1 * var(--calcite-spacing-base))", "--calcite-offset-invert-focus"),
},
".transition-default": {
// we explicitly list these properties to avoid animating properties that are not intended to be animated and that might affect performance
Expand Down
Loading