Skip to content

Commit e7f55d8

Browse files
authored
Merge branch 'spectrum-two' into aramos-adobe/css781-illustrated-message-s2-tokens
2 parents a4fc8e3 + 7e783b6 commit e7f55d8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+422
-48
lines changed

.changeset/pre.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,21 +109,28 @@
109109
"few-eels-retire",
110110
"fresh-seahorses-join",
111111
"friendly-dolls-raise",
112+
"healthy-zebras-unite",
113+
"hip-spies-try",
112114
"hot-books-fail",
113115
"light-years-speak",
114116
"loud-vans-brush",
115117
"mean-eggs-learn",
116118
"metal-fireants-switch",
117119
"nine-kings-repair",
118120
"perfect-dogs-smash",
121+
"plenty-trees-act",
119122
"pretty-parents-drum",
120123
"proud-jokes-rule",
124+
"sixty-crabs-thank",
121125
"sixty-vans-thank",
122126
"spotty-onions-study",
123127
"strange-glasses-allow",
124128
"tame-bobcats-beam",
129+
"tame-wasps-shake",
130+
"ten-lizards-work",
125131
"twenty-tables-know",
126132
"weak-kings-pretend",
133+
"wicked-dragons-cheer",
127134
"young-cheetahs-peel"
128135
]
129136
}

.changeset/tame-wasps-shake.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@spectrum-css/tokens": patch
3+
---
4+
5+
Uses the latest releases from Spectrum Tokens (spectrum-tokens@13.0.0-beta.56)

.storybook/CHANGELOG.md

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Change Log
22

3+
## 11.0.1-next.2
4+
5+
### Patch Changes
6+
7+
- [#2352](https://github.com/adobe/spectrum-css/pull/2352) [`2a9cb4a`](https://github.com/adobe/spectrum-css/commit/2a9cb4afd2514fa527f4819b7a6c00864b0cccf2) Thanks [@pfulton](https://github.com/pfulton)! - Updates the tags used by the stories in the "Foundations" documentation, so hidden stories remain hidden on the sidebar.
8+
9+
- Updated dependencies [[`0c431fc`](https://github.com/adobe/spectrum-css/commit/0c431fce7f38f967f934daa578b9bd2d8d173e76)]:
10+
- @spectrum-css/tokens@14.0.0-next.12
11+
- @spectrum-css/bundle@1.0.0
12+
313
## 11.0.1-next.1
414

515
### Patch Changes
@@ -342,7 +352,9 @@ This component has been deprecated. Use an action bar to allow users to perform
342352

343353
🗓 2024-02-06
344354
<a name="7.4.2-next.0"></a>
355+
345356
## 7.4.2-next.0
357+
346358
🗓 2024-02-06 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/preview@7.4.1...@spectrum-css/preview@7.4.2-next.0)
347359

348360
**Note:** Spectrum 2 next version
@@ -418,11 +430,11 @@ This component has been deprecated. Use an action bar to allow users to perform
418430

419431
- feat(icon,ui-icons)!: migrate the icon compiler to a distinct package (#2343)([d73d594](https://github.com/adobe/spectrum-css/commit/d73d594)), closes[#2343](https://github.com/adobe/spectrum-css/issues/2343)
420432

421-
###
422-
🛑 BREAKING CHANGES
433+
###
434+
435+
🛑 BREAKING CHANGES
423436

424-
*
425-
- @spectrum-css/icon will no longer contain SVG assets; it will be a purely CSS package with all SVG assets migrated to the new @spectrum-css/ui-icons package.
437+
- - @spectrum-css/icon will no longer contain SVG assets; it will be a purely CSS package with all SVG assets migrated to the new @spectrum-css/ui-icons package.
426438

427439
* NEW: @spectrum-css/ui-icons package for all SVG icons in the UI set.
428440

.storybook/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/preview",
3-
"version": "11.0.1-next.1",
3+
"version": "11.0.1-next.2",
44
"description": "A Spectrum CSS preview",
55
"license": "Apache-2.0",
66
"author": "Adobe",

components/actionbutton/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Change Log
22

3+
## 6.2.1-next.0
4+
5+
### Patch Changes
6+
7+
- [#3517](https://github.com/adobe/spectrum-css/pull/3517) [`7582c1f`](https://github.com/adobe/spectrum-css/commit/7582c1f5c73de5ecf962bfad0294f162d7035751) Thanks [@cdransf](https://github.com/cdransf)! - Define undefined properties from theme directory.
8+
9+
- Updated dependencies [[`0c431fc`](https://github.com/adobe/spectrum-css/commit/0c431fce7f38f967f934daa578b9bd2d8d173e76)]:
10+
- @spectrum-css/tokens@14.0.0-next.12
11+
312
## 6.2.0
413

514
### Minor Changes

components/actionbutton/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/actionbutton",
3-
"version": "6.2.0",
3+
"version": "6.2.1-next.0",
44
"description": "The Spectrum CSS action button component",
55
"license": "Apache-2.0",
66
"author": "Adobe",

components/assetcard/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Change Log
22

3+
## 4.2.1-next.0
4+
5+
### Patch Changes
6+
7+
- [#2352](https://github.com/adobe/spectrum-css/pull/2352) [`6b41b50`](https://github.com/adobe/spectrum-css/commit/6b41b501768da3db70ae00f6097646583f8fbd01) Thanks [@pfulton](https://github.com/pfulton)! - Restores missing custom properties that were flagged by the linter. The missing properties were copied from the spectrum two theme files in the foundations branch. This clears up all linter errors and warnings for these components.
8+
9+
- Updated dependencies [[`0c431fc`](https://github.com/adobe/spectrum-css/commit/0c431fce7f38f967f934daa578b9bd2d8d173e76)]:
10+
- @spectrum-css/tokens@14.0.0-next.12
11+
312
## 4.2.0
413

514
### Minor Changes

components/assetcard/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/assetcard",
3-
"version": "4.2.0",
3+
"version": "4.2.1-next.0",
44
"description": "The Spectrum CSS asset card component",
55
"license": "Apache-2.0",
66
"author": "Adobe",

components/avatar/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Change Log
22

3+
## 8.0.0-next.1
4+
5+
### Patch Changes
6+
7+
- [#3517](https://github.com/adobe/spectrum-css/pull/3517) [`7582c1f`](https://github.com/adobe/spectrum-css/commit/7582c1f5c73de5ecf962bfad0294f162d7035751) Thanks [@cdransf](https://github.com/cdransf)! - Define undefined properties from theme directory.
8+
9+
- Updated dependencies [[`0c431fc`](https://github.com/adobe/spectrum-css/commit/0c431fce7f38f967f934daa578b9bd2d8d173e76)]:
10+
- @spectrum-css/tokens@14.0.0-next.12
11+
312
## 8.0.0-next.0
413

514
### Major Changes

components/avatar/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/avatar",
3-
"version": "8.0.0-next.0",
3+
"version": "8.0.0-next.1",
44
"description": "The Spectrum CSS avatar component",
55
"license": "Apache-2.0",
66
"author": "Adobe",

0 commit comments

Comments
 (0)