-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into dev/DS-943
- Loading branch information
Showing
10 changed files
with
721 additions
and
301 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
nodejs 22.12.0 | ||
nodejs 22.13.0 | ||
yarn 1.22.5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,11 @@ | ||
import { ColorAliasToken, defaultColorAliasTokens } from './alias/color-tokens'; | ||
import { defaultTextAliasTokens, TextAliasToken } from './alias/text-tokens'; | ||
|
||
export type AliasToken = | ||
| ColorAliasToken; | ||
| ColorAliasToken | ||
| TextAliasToken; | ||
|
||
export const defaultAliasTokens = { | ||
...defaultColorAliasTokens, | ||
...defaultTextAliasTokens, | ||
}; |
Oops, something went wrong.