diff --git a/.changeset/fair-carrots-kiss.md b/.changeset/fair-carrots-kiss.md new file mode 100644 index 00000000000..013d1690b7b --- /dev/null +++ b/.changeset/fair-carrots-kiss.md @@ -0,0 +1,7 @@ +--- +'@spectrum-web-components/styles': patch +--- + +Bring the CJK font alias token fix from CSS [#3883](https://github.com/adobe/spectrum-css/pull/3883) [`4e3a120`](https://github.com/adobe/spectrum-css/commit/4e3a120339a6e7e6d0d19e3f2f7f608ab96621ed). + +The `--spectrum-cjk-font` token was incorrectly mapped to the code font-family stack instead of `--spectrum-cjk-font-family-stack`. Thanks [@byteakp](https://github.com/byteakp)! diff --git a/tools/styles/tokens-v2/global-vars.css b/tools/styles/tokens-v2/global-vars.css index 6c3cd84c537..a22e5dd61de 100644 --- a/tools/styles/tokens-v2/global-vars.css +++ b/tools/styles/tokens-v2/global-vars.css @@ -645,7 +645,7 @@ --spectrum-font-style: var(--spectrum-default-font-style); --spectrum-font-size: var(--spectrum-font-size-100); --spectrum-cjk-font-family-stack: adobe-clean-han-japanese, var(--spectrum-cjk-font-family), sans-serif; - --spectrum-cjk-font: var(--spectrum-code-font-family-stack); + --spectrum-cjk-font: var(--spectrum-cjk-font-family-stack); --spectrum-docs-static-white-background-color-rgb: 15, 121, 125; --spectrum-docs-static-white-background-color: rgba(var(--spectrum-docs-static-white-background-color-rgb)); --spectrum-docs-static-black-background-color-rgb: 181, 209, 211; diff --git a/tools/styles/tokens-v2/index.css b/tools/styles/tokens-v2/index.css index d0b40ddc542..91eb9888c97 100644 --- a/tools/styles/tokens-v2/index.css +++ b/tools/styles/tokens-v2/index.css @@ -1474,7 +1474,7 @@ --spectrum-font-style: var(--spectrum-default-font-style); --spectrum-font-size: var(--spectrum-font-size-100); --spectrum-cjk-font-family-stack: adobe-clean-han-japanese, var(--spectrum-cjk-font-family), sans-serif; - --spectrum-cjk-font: var(--spectrum-code-font-family-stack); + --spectrum-cjk-font: var(--spectrum-cjk-font-family-stack); --spectrum-docs-static-white-background-color-rgb: 15, 121, 125; --spectrum-docs-static-white-background-color: rgba(var(--spectrum-docs-static-white-background-color-rgb)); --spectrum-docs-static-black-background-color-rgb: 181, 209, 211; diff --git a/tools/styles/tokens-v2/spectrum/custom-vars.css b/tools/styles/tokens-v2/spectrum/custom-vars.css index 687d158d9b9..78a40fbe3c2 100644 --- a/tools/styles/tokens-v2/spectrum/custom-vars.css +++ b/tools/styles/tokens-v2/spectrum/custom-vars.css @@ -31,7 +31,7 @@ --spectrum-code-font-family-stack: "Source Code Pro", Monaco, monospace; --spectrum-cjk-font-family-stack: adobe-clean-han-japanese, var(--spectrum-cjk-font-family), sans-serif; - --spectrum-cjk-font: var(--spectrum-code-font-family-stack); + --spectrum-cjk-font: var(--spectrum-cjk-font-family-stack); /* static white / black background color for docs containers */ --spectrum-docs-static-white-background-color-rgb: 15, 121, 125; diff --git a/tools/styles/tokens/index.css b/tools/styles/tokens/index.css index 36da06b0a4d..4858d300070 100644 --- a/tools/styles/tokens/index.css +++ b/tools/styles/tokens/index.css @@ -3108,7 +3108,7 @@ --spectrum-font-style: var(--spectrum-default-font-style); --spectrum-font-size: var(--spectrum-font-size-100); --spectrum-cjk-font-family-stack: adobe-clean-han-japanese, var(--spectrum-cjk-font-family), sans-serif; - --spectrum-cjk-font: var(--spectrum-code-font-family-stack); + --spectrum-cjk-font: var(--spectrum-cjk-font-family-stack); --spectrum-docs-static-white-background-color-rgb: 15, 121, 125; --spectrum-docs-static-white-background-color: rgba(var(--spectrum-docs-static-white-background-color-rgb)); --spectrum-docs-static-black-background-color-rgb: 181, 209, 211; diff --git a/tools/styles/tokens/spectrum/custom-vars.css b/tools/styles/tokens/spectrum/custom-vars.css index 70402b4534c..ee2789b739c 100644 --- a/tools/styles/tokens/spectrum/custom-vars.css +++ b/tools/styles/tokens/spectrum/custom-vars.css @@ -31,7 +31,7 @@ --spectrum-code-font-family-stack: "Source Code Pro", Monaco, monospace; --spectrum-cjk-font-family-stack: adobe-clean-han-japanese, var(--spectrum-cjk-font-family), sans-serif; - --spectrum-cjk-font: var(--spectrum-code-font-family-stack); + --spectrum-cjk-font: var(--spectrum-cjk-font-family-stack); --spectrum-docs-static-white-background-color-rgb: 15, 121, 125; --spectrum-docs-static-white-background-color: rgba(var(--spectrum-docs-static-white-background-color-rgb)); --spectrum-docs-static-black-background-color-rgb: 181, 209, 211; diff --git a/tools/styles/tokens/spectrum/global-vars.css b/tools/styles/tokens/spectrum/global-vars.css index 0a32bcc8698..64af8772e7b 100644 --- a/tools/styles/tokens/spectrum/global-vars.css +++ b/tools/styles/tokens/spectrum/global-vars.css @@ -70,7 +70,7 @@ --spectrum-font-style: var(--spectrum-default-font-style); --spectrum-font-size: var(--spectrum-font-size-100); --spectrum-cjk-font-family-stack: adobe-clean-han-japanese, var(--spectrum-cjk-font-family), sans-serif; - --spectrum-cjk-font: var(--spectrum-code-font-family-stack); + --spectrum-cjk-font: var(--spectrum-cjk-font-family-stack); --spectrum-docs-static-white-background-color-rgb: 15, 121, 125; --spectrum-docs-static-white-background-color: rgba(var(--spectrum-docs-static-white-background-color-rgb)); --spectrum-docs-static-black-background-color-rgb: 181, 209, 211; diff --git a/tools/styles/tokens/spectrum/index.css b/tools/styles/tokens/spectrum/index.css index 0a16089550c..b205a2b6442 100644 --- a/tools/styles/tokens/spectrum/index.css +++ b/tools/styles/tokens/spectrum/index.css @@ -170,7 +170,7 @@ --spectrum-font-style: var(--spectrum-default-font-style); --spectrum-font-size: var(--spectrum-font-size-100); --spectrum-cjk-font-family-stack: adobe-clean-han-japanese, var(--spectrum-cjk-font-family), sans-serif; - --spectrum-cjk-font: var(--spectrum-code-font-family-stack); + --spectrum-cjk-font: var(--spectrum-cjk-font-family-stack); --spectrum-docs-static-white-background-color-rgb: 15, 121, 125; --spectrum-docs-static-white-background-color: rgba(var(--spectrum-docs-static-white-background-color-rgb)); --spectrum-docs-static-black-background-color-rgb: 181, 209, 211;