Skip to content

Commit d7880a2

Browse files
GarthDBGarthDB
committed
fix: update main, resolved conflicts
2 parents a449613 + 6a1a1ea commit d7880a2

File tree

136 files changed

+1002
-261
lines changed

Some content is hidden

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

136 files changed

+1002
-261
lines changed

‎components/accordion/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
<a name="3.0.0-beta.4"></a>
7+
# 3.0.0-beta.4
8+
🗓 2020-10-20 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/accordion@3.0.0-beta.3...@spectrum-css/accordion@3.0.0-beta.4)
9+
10+
**Note:** Version bump only for package @spectrum-css/accordion
11+
12+
13+
14+
15+
616
<a name="3.0.0-beta.3"></a>
717
# 3.0.0-beta.3
818
🗓 2020-09-23 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/accordion@3.0.0-beta.2...@spectrum-css/accordion@3.0.0-beta.3)

‎components/accordion/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/accordion",
3-
"version": "3.0.0-beta.3",
3+
"version": "3.0.0-beta.4",
44
"description": "The Spectrum CSS accordion component",
55
"license": "Apache-2.0",
66
"main": "dist/index-vars.css",
@@ -20,8 +20,8 @@
2020
"@spectrum-css/vars": "^2.3.0"
2121
},
2222
"devDependencies": {
23-
"@spectrum-css/component-builder": "^1.2.1-beta.0",
24-
"@spectrum-css/icon": "^3.0.0-beta.0",
23+
"@spectrum-css/component-builder": "^2.0.0-beta.0",
24+
"@spectrum-css/icon": "^3.0.0-beta.1",
2525
"@spectrum-css/vars": "^2.3.0",
2626
"gulp": "^4.0.0"
2727
},

‎components/actionbar/CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
<a name="3.0.0-beta.5"></a>
7+
# 3.0.0-beta.5
8+
🗓 2020-10-20 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actionbar@3.0.0-beta.4...@spectrum-css/actionbar@3.0.0-beta.5)
9+
10+
### 🐛 Bug fixes
11+
12+
* **actionbar:** ensure Poppover padding is managed for content direction ([06e5f1a](https://github.com/adobe/spectrum-css/commit/06e5f1a))
13+
14+
15+
16+
17+
618
<a name="3.0.0-beta.4"></a>
719
# 3.0.0-beta.4
820
🗓 2020-09-23 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actionbar@3.0.0-beta.3...@spectrum-css/actionbar@3.0.0-beta.4)

‎components/actionbar/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/actionbar",
3-
"version": "3.0.0-beta.4",
3+
"version": "3.0.0-beta.5",
44
"description": "The Spectrum CSS actionbar component",
55
"license": "Apache-2.0",
66
"main": "dist/index-vars.css",
@@ -24,18 +24,18 @@
2424
"@spectrum-css/vars": "^2.3.0"
2525
},
2626
"devDependencies": {
27-
"@spectrum-css/actiongroup": "^1.0.0-beta.3",
28-
"@spectrum-css/actionbutton": "^1.0.0-beta.0",
29-
"@spectrum-css/checkbox": "^3.0.0-beta.4",
30-
"@spectrum-css/component-builder": "^1.2.1-beta.0",
31-
"@spectrum-css/icon": "^3.0.0-beta.0",
32-
"@spectrum-css/popover": "^3.0.0-beta.4",
33-
"@spectrum-css/table": "^3.0.0-beta.4",
27+
"@spectrum-css/actiongroup": "^1.0.0-beta.4",
28+
"@spectrum-css/button": "^3.0.0-beta.5",
29+
"@spectrum-css/checkbox": "^3.0.0-beta.5",
30+
"@spectrum-css/component-builder": "^2.0.0-beta.0",
31+
"@spectrum-css/icon": "^3.0.0-beta.1",
32+
"@spectrum-css/popover": "^3.0.0-beta.5",
33+
"@spectrum-css/table": "^3.0.0-beta.5",
3434
"@spectrum-css/vars": "^2.3.0",
3535
"gulp": "^4.0.0"
3636
},
3737
"publishConfig": {
3838
"access": "public"
3939
},
4040
"homepage": "https://opensource.adobe.com/spectrum-css/"
41-
}
41+
}

‎components/actiongroup/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
<a name="1.0.0-beta.4"></a>
7+
# 1.0.0-beta.4
8+
🗓 2020-10-20 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actiongroup@1.0.0-beta.3...@spectrum-css/actiongroup@1.0.0-beta.4)
9+
10+
**Note:** Version bump only for package @spectrum-css/actiongroup
11+
12+
13+
14+
15+
616
<a name="1.0.0-beta.3"></a>
717
# 1.0.0-beta.3
818
🗓 2020-09-23 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actiongroup@1.0.0-beta.2...@spectrum-css/actiongroup@1.0.0-beta.3)

‎components/actiongroup/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/actiongroup",
3-
"version": "1.0.0-beta.3",
3+
"version": "1.0.0-beta.4",
44
"description": "The Spectrum CSS actiongroup component",
55
"license": "Apache-2.0",
66
"main": "dist/index-vars.css",
@@ -20,14 +20,14 @@
2020
"@spectrum-css/vars": "^2.3.0"
2121
},
2222
"devDependencies": {
23-
"@spectrum-css/actionbutton": "^1.0.0-beta.0",
24-
"@spectrum-css/component-builder": "^1.2.1-beta.0",
25-
"@spectrum-css/icon": "^3.0.0-beta.0",
23+
"@spectrum-css/button": "^3.0.0-beta.5",
24+
"@spectrum-css/component-builder": "^2.0.0-beta.0",
25+
"@spectrum-css/icon": "^3.0.0-beta.1",
2626
"@spectrum-css/vars": "^2.3.0",
2727
"gulp": "^4.0.0"
2828
},
2929
"publishConfig": {
3030
"access": "public"
3131
},
3232
"homepage": "https://opensource.adobe.com/spectrum-css/"
33-
}
33+
}

‎components/actionmenu/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
<a name="3.0.0-beta.5"></a>
7+
# 3.0.0-beta.5
8+
🗓 2020-10-20 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actionmenu@3.0.0-beta.4...@spectrum-css/actionmenu@3.0.0-beta.5)
9+
10+
**Note:** Version bump only for package @spectrum-css/actionmenu
11+
12+
13+
14+
15+
616
<a name="3.0.0-beta.4"></a>
717
# 3.0.0-beta.4
818
🗓 2020-09-23 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actionmenu@3.0.0-beta.3...@spectrum-css/actionmenu@3.0.0-beta.4)

‎components/actionmenu/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/actionmenu",
3-
"version": "3.0.0-beta.4",
3+
"version": "3.0.0-beta.5",
44
"description": "The Spectrum CSS actionmenu component",
55
"license": "Apache-2.0",
66
"main": "dist/index-vars.css",
@@ -23,16 +23,16 @@
2323
"@spectrum-css/vars": "^2.3.0"
2424
},
2525
"devDependencies": {
26-
"@spectrum-css/actionbutton": "^1.0.0-beta.0",
27-
"@spectrum-css/component-builder": "^1.2.1-beta.0",
28-
"@spectrum-css/icon": "^3.0.0-beta.0",
29-
"@spectrum-css/menu": "^3.0.0-beta.3",
30-
"@spectrum-css/popover": "^3.0.0-beta.4",
26+
"@spectrum-css/button": "^3.0.0-beta.5",
27+
"@spectrum-css/component-builder": "^2.0.0-beta.0",
28+
"@spectrum-css/icon": "^3.0.0-beta.1",
29+
"@spectrum-css/menu": "^3.0.0-beta.4",
30+
"@spectrum-css/popover": "^3.0.0-beta.5",
3131
"@spectrum-css/vars": "^2.3.0",
3232
"gulp": "^4.0.0"
3333
},
3434
"publishConfig": {
3535
"access": "public"
3636
},
3737
"homepage": "https://opensource.adobe.com/spectrum-css/"
38-
}
38+
}

‎components/asset/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
<a name="3.0.0-beta.4"></a>
7+
# 3.0.0-beta.4
8+
🗓 2020-10-20 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/asset@3.0.0-beta.3...@spectrum-css/asset@3.0.0-beta.4)
9+
10+
**Note:** Version bump only for package @spectrum-css/asset
11+
12+
13+
14+
15+
616
<a name="3.0.0-beta.3"></a>
717
# 3.0.0-beta.3
818
🗓 2020-09-23 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/asset@3.0.0-beta.2...@spectrum-css/asset@3.0.0-beta.3)

‎components/asset/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/asset",
3-
"version": "3.0.0-beta.3",
3+
"version": "3.0.0-beta.4",
44
"description": "The Spectrum CSS asset component",
55
"license": "Apache-2.0",
66
"main": "dist/index-vars.css",
@@ -19,7 +19,7 @@
1919
"@spectrum-css/vars": "^2.3.0"
2020
},
2121
"devDependencies": {
22-
"@spectrum-css/component-builder": "^1.2.1-beta.0",
22+
"@spectrum-css/component-builder": "^2.0.0-beta.0",
2323
"@spectrum-css/vars": "^2.3.0",
2424
"gulp": "^4.0.0"
2525
},

0 commit comments

Comments
 (0)