Skip to content

Commit e7f55d8

Browse files
aramos-adobearamos-adobe
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

+7
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

+5
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 ([email protected])

‎.storybook/CHANGELOG.md

+16-4
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/[email protected]...@spectrum-css/[email protected])
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

+1-1
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

+9
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

+1-1
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

+9
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

+1-1
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

+9
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

+1-1
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",

‎components/button/CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Change Log
22

3+
## 14.0.0-next.8
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
## 14.0.0-next.7
413

514
### Patch Changes

‎components/button/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/button",
3-
"version": "14.0.0-next.7",
3+
"version": "14.0.0-next.8",
44
"description": "The Spectrum CSS button component",
55
"license": "Apache-2.0",
66
"author": "Adobe",

‎components/calendar/CHANGELOG.md

+19-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# Change Log
22

3+
## 5.3.1-next.0
4+
5+
### Patch Changes
6+
7+
- [#2352](https://github.com/adobe/spectrum-css/pull/2352) [`8d65de0`](https://github.com/adobe/spectrum-css/commit/8d65de0233a6b12e72002b47e9484dbe5f0636be) Thanks [@pfulton](https://github.com/pfulton)! - Fixes to align `spectrum-two` with `s2-foundations-redux`/`main`, mostly defining unused custom properties, but addresses any other lint warnings or inconsistencies noted in the following components:
8+
9+
**Calendar**: Defines 1 previously undefined custom property to align with `main` and `s2-foundations-redux`
10+
**Dial**: Defines 6 previously undefined custom properties, removes 3 unused custom properties
11+
**Pickerbutton**: Defines 9 previously undefined custom properties to align with `main` and `s2-foundations-redux`
12+
**Progressbar**: Removes 3 unused custom properties, reverts background-color to background to accommodate gradients
13+
**Radio**: Defines 4 previously undefined custom properties to align with `main` and `s2-foundations-redux`
14+
**Stepper**: moves high contrast block further down to align with other components' CSS structure, defines multiple undefined custom properties, adds disable-next-line comment to suppress no-unused-custom-properties warning
15+
16+
- Updated dependencies [[`7582c1f`](https://github.com/adobe/spectrum-css/commit/7582c1f5c73de5ecf962bfad0294f162d7035751), [`0c431fc`](https://github.com/adobe/spectrum-css/commit/0c431fce7f38f967f934daa578b9bd2d8d173e76)]:
17+
- @spectrum-css/actionbutton@6.2.1-next.0
18+
- @spectrum-css/tokens@14.0.0-next.12
19+
320
## 5.3.0
421

522
### Minor Changes
@@ -84,7 +101,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
84101
\*feat!: postcss config build and script; remove gulp (#2466)([b0f337b](https://github.com/adobe/spectrum-css/commit/b0f337b)), closes[#2466](https://github.com/adobe/spectrum-css/issues/2466)
85102

86103
### 🛑 BREAKING CHANGES
87-
- Removes component-builder & component-builder-simple for script leveraging postcss
104+
105+
- Removes component-builder & component-builder-simple for script leveraging postcss
88106

89107
- Imports added to index.css and themes/express.css
90108

‎components/calendar/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/calendar",
3-
"version": "5.3.0",
3+
"version": "5.3.1-next.0",
44
"description": "The Spectrum CSS calendar component",
55
"license": "Apache-2.0",
66
"author": "Adobe",

‎components/clearbutton/CHANGELOG.md

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Change Log
22

3+
## 6.4.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.4.0
413

514
### Minor Changes
@@ -91,7 +100,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
91100
\*feat!: postcss config build and script; remove gulp (#2466)([b0f337b](https://github.com/adobe/spectrum-css/commit/b0f337b)), closes[#2466](https://github.com/adobe/spectrum-css/issues/2466)
92101

93102
### 🛑 BREAKING CHANGES
94-
- Removes component-builder & component-builder-simple for script leveraging postcss
103+
104+
- Removes component-builder & component-builder-simple for script leveraging postcss
95105

96106
- Imports added to index.css and themes/express.css
97107

‎components/clearbutton/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/clearbutton",
3-
"version": "6.4.0",
3+
"version": "6.4.1-next.0",
44
"description": "The Spectrum CSS clearbutton component",
55
"license": "Apache-2.0",
66
"author": "Adobe",

‎components/colorwheel/CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Change Log
22

3+
## 5.0.0-next.1
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
## 5.0.0-next.0
413

514
### Patch Changes

‎components/colorwheel/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/colorwheel",
3-
"version": "5.0.0-next.0",
3+
"version": "5.0.0-next.1",
44
"description": "The Spectrum CSS Color Area component",
55
"license": "Apache-2.0",
66
"author": "Adobe",

‎components/combobox/CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Change Log
22

3+
## 4.0.0-next.1
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), [`2850ef5`](https://github.com/adobe/spectrum-css/commit/2850ef5439d50fd47db81783c861a63ffa42414f), [`8d65de0`](https://github.com/adobe/spectrum-css/commit/8d65de0233a6b12e72002b47e9484dbe5f0636be)]:
10+
- @spectrum-css/tokens@14.0.0-next.12
11+
- @spectrum-css/textfield@7.3.1-next.0
12+
- @spectrum-css/popover@8.0.0-next.1
13+
- @spectrum-css/menu@8.0.0-next.1
14+
- @spectrum-css/pickerbutton@6.0.0-next.1
15+
316
## 4.0.0-next.0
417

518
### Patch Changes

‎components/combobox/package.json

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

‎components/datepicker/CHANGELOG.md

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Change Log
22

3+
## 4.0.0-next.1
4+
5+
### Patch Changes
6+
7+
- [#2352](https://github.com/adobe/spectrum-css/pull/2352) [`5fae8ab`](https://github.com/adobe/spectrum-css/commit/5fae8aba83d396103aca56c108e7e81f61fce655) Thanks [@pfulton](https://github.com/pfulton)! - Define undefined custom properties from themes directory.
8+
9+
- Updated dependencies [[`0c431fc`](https://github.com/adobe/spectrum-css/commit/0c431fce7f38f967f934daa578b9bd2d8d173e76), [`2850ef5`](https://github.com/adobe/spectrum-css/commit/2850ef5439d50fd47db81783c861a63ffa42414f), [`8d65de0`](https://github.com/adobe/spectrum-css/commit/8d65de0233a6b12e72002b47e9484dbe5f0636be)]:
10+
- @spectrum-css/tokens@14.0.0-next.12
11+
- @spectrum-css/textfield@7.3.1-next.0
12+
- @spectrum-css/popover@8.0.0-next.1
13+
- @spectrum-css/pickerbutton@6.0.0-next.1
14+
- @spectrum-css/calendar@5.3.1-next.0
15+
316
## 4.0.0-next.0
417

518
### Patch Changes
@@ -120,7 +133,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
120133
\*feat!: postcss config build and script; remove gulp (#2466)([b0f337b](https://github.com/adobe/spectrum-css/commit/b0f337b)), closes[#2466](https://github.com/adobe/spectrum-css/issues/2466)
121134

122135
### 🛑 BREAKING CHANGES
123-
- Removes component-builder & component-builder-simple for script leveraging postcss
136+
137+
- Removes component-builder & component-builder-simple for script leveraging postcss
124138

125139
- Imports added to index.css and themes/express.css
126140

‎components/datepicker/package.json

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

‎components/dial/CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Change Log
22

3+
## 3.2.1-next.0
4+
5+
### Patch Changes
6+
7+
- [#2352](https://github.com/adobe/spectrum-css/pull/2352) [`8d65de0`](https://github.com/adobe/spectrum-css/commit/8d65de0233a6b12e72002b47e9484dbe5f0636be) Thanks [@pfulton](https://github.com/pfulton)! - Fixes to align `spectrum-two` with `s2-foundations-redux`/`main`, mostly defining unused custom properties, but addresses any other lint warnings or inconsistencies noted in the following components:
8+
9+
**Calendar**: Defines 1 previously undefined custom property to align with `main` and `s2-foundations-redux`
10+
**Dial**: Defines 6 previously undefined custom properties, removes 3 unused custom properties
11+
**Pickerbutton**: Defines 9 previously undefined custom properties to align with `main` and `s2-foundations-redux`
12+
**Progressbar**: Removes 3 unused custom properties, reverts background-color to background to accommodate gradients
13+
**Radio**: Defines 4 previously undefined custom properties to align with `main` and `s2-foundations-redux`
14+
**Stepper**: moves high contrast block further down to align with other components' CSS structure, defines multiple undefined custom properties, adds disable-next-line comment to suppress no-unused-custom-properties warning
15+
16+
- Updated dependencies [[`0c431fc`](https://github.com/adobe/spectrum-css/commit/0c431fce7f38f967f934daa578b9bd2d8d173e76)]:
17+
- @spectrum-css/tokens@14.0.0-next.12
18+
319
## 3.2.0
420

521
### Minor Changes

‎components/dial/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/dial",
3-
"version": "3.2.0",
3+
"version": "3.2.1-next.0",
44
"description": "The Spectrum CSS dial component",
55
"license": "Apache-2.0",
66
"author": "Adobe",

‎components/dialog/CHANGELOG.md

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Change Log
22

3+
## 11.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
## 11.0.0-next.0
413

514
### Major Changes
@@ -165,7 +174,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
165174
\*feat!: postcss config build and script; remove gulp (#2466)([b0f337b](https://github.com/adobe/spectrum-css/commit/b0f337b)), closes[#2466](https://github.com/adobe/spectrum-css/issues/2466)
166175

167176
### 🛑 BREAKING CHANGES
168-
- Removes component-builder & component-builder-simple for script leveraging postcss
177+
178+
- Removes component-builder & component-builder-simple for script leveraging postcss
169179

170180
- Imports added to index.css and themes/express.css
171181

0 commit comments

Comments
 (0)