Skip to content

Commit bf98e05

Browse files
committed
fix(styles): cjk alias mapping fixed
1 parent 3ac7661 commit bf98e05

File tree

8 files changed

+14
-7
lines changed

8 files changed

+14
-7
lines changed

.changeset/fair-carrots-kiss.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@spectrum-web-components/styles': patch
3+
---
4+
5+
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).
6+
7+
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)!

tools/styles/tokens-v2/global-vars.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@
645645
--spectrum-font-style: var(--spectrum-default-font-style);
646646
--spectrum-font-size: var(--spectrum-font-size-100);
647647
--spectrum-cjk-font-family-stack: adobe-clean-han-japanese, var(--spectrum-cjk-font-family), sans-serif;
648-
--spectrum-cjk-font: var(--spectrum-code-font-family-stack);
648+
--spectrum-cjk-font: var(--spectrum-cjk-font-family-stack);
649649
--spectrum-docs-static-white-background-color-rgb: 15, 121, 125;
650650
--spectrum-docs-static-white-background-color: rgba(var(--spectrum-docs-static-white-background-color-rgb));
651651
--spectrum-docs-static-black-background-color-rgb: 181, 209, 211;

tools/styles/tokens-v2/index.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1474,7 +1474,7 @@
14741474
--spectrum-font-style: var(--spectrum-default-font-style);
14751475
--spectrum-font-size: var(--spectrum-font-size-100);
14761476
--spectrum-cjk-font-family-stack: adobe-clean-han-japanese, var(--spectrum-cjk-font-family), sans-serif;
1477-
--spectrum-cjk-font: var(--spectrum-code-font-family-stack);
1477+
--spectrum-cjk-font: var(--spectrum-cjk-font-family-stack);
14781478
--spectrum-docs-static-white-background-color-rgb: 15, 121, 125;
14791479
--spectrum-docs-static-white-background-color: rgba(var(--spectrum-docs-static-white-background-color-rgb));
14801480
--spectrum-docs-static-black-background-color-rgb: 181, 209, 211;

tools/styles/tokens-v2/spectrum/custom-vars.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
--spectrum-code-font-family-stack: "Source Code Pro", Monaco, monospace;
3232

3333
--spectrum-cjk-font-family-stack: adobe-clean-han-japanese, var(--spectrum-cjk-font-family), sans-serif;
34-
--spectrum-cjk-font: var(--spectrum-code-font-family-stack);
34+
--spectrum-cjk-font: var(--spectrum-cjk-font-family-stack);
3535

3636
/* static white / black background color for docs containers */
3737
--spectrum-docs-static-white-background-color-rgb: 15, 121, 125;

tools/styles/tokens/index.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3108,7 +3108,7 @@
31083108
--spectrum-font-style: var(--spectrum-default-font-style);
31093109
--spectrum-font-size: var(--spectrum-font-size-100);
31103110
--spectrum-cjk-font-family-stack: adobe-clean-han-japanese, var(--spectrum-cjk-font-family), sans-serif;
3111-
--spectrum-cjk-font: var(--spectrum-code-font-family-stack);
3111+
--spectrum-cjk-font: var(--spectrum-cjk-font-family-stack);
31123112
--spectrum-docs-static-white-background-color-rgb: 15, 121, 125;
31133113
--spectrum-docs-static-white-background-color: rgba(var(--spectrum-docs-static-white-background-color-rgb));
31143114
--spectrum-docs-static-black-background-color-rgb: 181, 209, 211;

tools/styles/tokens/spectrum/custom-vars.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
--spectrum-code-font-family-stack: "Source Code Pro", Monaco, monospace;
3232

3333
--spectrum-cjk-font-family-stack: adobe-clean-han-japanese, var(--spectrum-cjk-font-family), sans-serif;
34-
--spectrum-cjk-font: var(--spectrum-code-font-family-stack);
34+
--spectrum-cjk-font: var(--spectrum-cjk-font-family-stack);
3535
--spectrum-docs-static-white-background-color-rgb: 15, 121, 125;
3636
--spectrum-docs-static-white-background-color: rgba(var(--spectrum-docs-static-white-background-color-rgb));
3737
--spectrum-docs-static-black-background-color-rgb: 181, 209, 211;

tools/styles/tokens/spectrum/global-vars.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
--spectrum-font-style: var(--spectrum-default-font-style);
7171
--spectrum-font-size: var(--spectrum-font-size-100);
7272
--spectrum-cjk-font-family-stack: adobe-clean-han-japanese, var(--spectrum-cjk-font-family), sans-serif;
73-
--spectrum-cjk-font: var(--spectrum-code-font-family-stack);
73+
--spectrum-cjk-font: var(--spectrum-cjk-font-family-stack);
7474
--spectrum-docs-static-white-background-color-rgb: 15, 121, 125;
7575
--spectrum-docs-static-white-background-color: rgba(var(--spectrum-docs-static-white-background-color-rgb));
7676
--spectrum-docs-static-black-background-color-rgb: 181, 209, 211;

tools/styles/tokens/spectrum/index.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
--spectrum-font-style: var(--spectrum-default-font-style);
171171
--spectrum-font-size: var(--spectrum-font-size-100);
172172
--spectrum-cjk-font-family-stack: adobe-clean-han-japanese, var(--spectrum-cjk-font-family), sans-serif;
173-
--spectrum-cjk-font: var(--spectrum-code-font-family-stack);
173+
--spectrum-cjk-font: var(--spectrum-cjk-font-family-stack);
174174
--spectrum-docs-static-white-background-color-rgb: 15, 121, 125;
175175
--spectrum-docs-static-white-background-color: rgba(var(--spectrum-docs-static-white-background-color-rgb));
176176
--spectrum-docs-static-black-background-color-rgb: 181, 209, 211;

0 commit comments

Comments
 (0)