chore: merge remote-tracking branch 'origin' into spectrum-two

Author: castastrophe

.github/renovate.json

@@ -12,18 +12,6 @@
 		{
 			"groupName": "storybook ecosystem",
 			"matchPackageNames": ["storybook", "@storybook/*", "@types/storybook*"],
-			"matchUpdateTypes": ["minor", "patch"]
-		},
-		{
-			"groupName": "storybook ecosystem (disabled)",
-			"matchPackageNames": [
-				"storybook",
-				"@storybook/*",
-				"@types/storybook*",
-				"@chromatic-com/storybook"
-			],
-			"matchUpdateTypes": ["major"],
-			"baseBranches": ["main"],
 			"enabled": false
 		},
 		{

.storybook/CHANGELOG.md

@@ -52,6 +52,13 @@
 - Updated dependencies [[`60a156d`](https://github.com/adobe/spectrum-css/commit/60a156d7c0efcc999bc440274bbbbf586beb274b)]:
   - @spectrum-css/tokens@16.1.0-next.0
 
+## 12.0.5
+
+### Patch Changes
+
+- Updated dependencies [[`4e3a120`](https://github.com/adobe/spectrum-css/commit/4e3a120339a6e7e6d0d19e3f2f7f608ab96621ed)]:
+  - @spectrum-css/tokens@16.0.2
+
 ## 12.0.4
 
 ### Patch Changes

.vscode/settings.json

@@ -182,5 +182,5 @@
 		".storybook/deprecated/*/*.mdx",
 		"components/*/stories/*.stories.js",
 		"components/*/stories/*.mdx"
-	]
+    ]
 }

tokens/CHANGELOG.md

@@ -607,13 +607,21 @@ Adds custom vars for coachmark action menu vertical spacing. These help provide
 In `tokens/custom/large-vars.css`: `--spectrum-coachmark-action-menu-vertical-offset`.
 In `tokens/custom/medium-vars.css`: `--spectrum-coachmark-action-menu-vertical-offset`.
 
+## 16.0.2
+
+### Patch Changes
+
+- [#3883](https://github.com/adobe/spectrum-css/pull/3883) [`4e3a120`](https://github.com/adobe/spectrum-css/commit/4e3a120339a6e7e6d0d19e3f2f7f608ab96621ed) Thanks [@byteakp](https://github.com/byteakp)!
+
+Fixed `--spectrum-cjk-font` variable to correctly reference `--spectrum-cjk-font-family-stack` instead of `--spectrum-code-font-family-stack`.
+
 ## 16.0.1
 
 ### Patch Changes
 
 📝 [#3541](https://github.com/adobe/spectrum-css/pull/3541) [`1a3245c`](https://github.com/adobe/spectrum-css/commit/1a3245c3a660bc52ed260f18b6cceab5ee81541d) Thanks [@castastrophe](https://github.com/castastrophe)!
 
-- Dependency alignment across the project.
+Dependency alignment across the project.
 
 Set component peerDependencies as optional to reduce console warnings on downstream projects.
 
@@ -958,9 +966,12 @@ If you are looking to implement a fully S2 design, please explore the `next` rel
 - `--spectrum-switch-top-to-control-medium`
   - **value**: 9px (desktop)
   - **value**: 11px (mobile)
-- `--spectrum-switch-top-to-control-large`
-  - **value**: 12px (desktop)
-  - **value**: 15px (mobile)
+- `--spectrum-switch-top-to-control
+
+-large`
+
+- **value**: 12px (desktop)
+- **value**: 15px (mobile)
 - `--spectrum-switch-top-to-control-extra-large`
   - **value**: 15px (desktop)
   - **value**: 19px (mobile)

tokens/custom/global-vars.css

@@ -55,7 +55,7 @@
 	--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);
 
 	/* Gradient that changes with the color theme. */
 	--spectrum-examples-gradient: linear-gradient(45deg, var(--spectrum-magenta-1500), var(--spectrum-blue-1500));