fix: update main, resolved conflicts

adobe · Oct 20, 2020 · d7880a2 · d7880a2
2 parents a449613 + 6a1a1ea
commit d7880a2
Show file tree

Hide file tree

Showing 136 changed files with 1,002 additions and 261 deletions.
diff --git a/components/accordion/CHANGELOG.md b/components/accordion/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="3.0.0-beta.4"></a>
+# 3.0.0-beta.4
+🗓 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)
+
+**Note:** Version bump only for package @spectrum-css/accordion
+
+
+
+
+
 <a name="3.0.0-beta.3"></a>
 # 3.0.0-beta.3
 🗓 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)

diff --git a/components/accordion/package.json b/components/accordion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-css/accordion",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0-beta.4",
   "description": "The Spectrum CSS accordion component",
   "license": "Apache-2.0",
   "main": "dist/index-vars.css",
@@ -20,8 +20,8 @@
     "@spectrum-css/vars": "^2.3.0"
   },
   "devDependencies": {
-    "@spectrum-css/component-builder": "^1.2.1-beta.0",
-    "@spectrum-css/icon": "^3.0.0-beta.0",
+    "@spectrum-css/component-builder": "^2.0.0-beta.0",
+    "@spectrum-css/icon": "^3.0.0-beta.1",
     "@spectrum-css/vars": "^2.3.0",
     "gulp": "^4.0.0"
   },

diff --git a/components/actionbar/CHANGELOG.md b/components/actionbar/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="3.0.0-beta.5"></a>
+# 3.0.0-beta.5
+🗓 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)
+
+### 🐛 Bug fixes
+
+* **actionbar:** ensure Poppover padding is managed for content direction ([06e5f1a](https://github.com/adobe/spectrum-css/commit/06e5f1a))
+
+
+
+
+
 <a name="3.0.0-beta.4"></a>
 # 3.0.0-beta.4
 🗓 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)

diff --git a/components/actionbar/package.json b/components/actionbar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-css/actionbar",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.5",
   "description": "The Spectrum CSS actionbar component",
   "license": "Apache-2.0",
   "main": "dist/index-vars.css",
@@ -24,18 +24,18 @@
     "@spectrum-css/vars": "^2.3.0"
   },
   "devDependencies": {
-    "@spectrum-css/actiongroup": "^1.0.0-beta.3",
-    "@spectrum-css/actionbutton": "^1.0.0-beta.0",
-    "@spectrum-css/checkbox": "^3.0.0-beta.4",
-    "@spectrum-css/component-builder": "^1.2.1-beta.0",
-    "@spectrum-css/icon": "^3.0.0-beta.0",
-    "@spectrum-css/popover": "^3.0.0-beta.4",
-    "@spectrum-css/table": "^3.0.0-beta.4",
+    "@spectrum-css/actiongroup": "^1.0.0-beta.4",
+    "@spectrum-css/button": "^3.0.0-beta.5",
+    "@spectrum-css/checkbox": "^3.0.0-beta.5",
+    "@spectrum-css/component-builder": "^2.0.0-beta.0",
+    "@spectrum-css/icon": "^3.0.0-beta.1",
+    "@spectrum-css/popover": "^3.0.0-beta.5",
+    "@spectrum-css/table": "^3.0.0-beta.5",
     "@spectrum-css/vars": "^2.3.0",
     "gulp": "^4.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
   "homepage": "https://opensource.adobe.com/spectrum-css/"
-}
+}
diff --git a/components/actiongroup/CHANGELOG.md b/components/actiongroup/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="1.0.0-beta.4"></a>
+# 1.0.0-beta.4
+🗓 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)
+
+**Note:** Version bump only for package @spectrum-css/actiongroup
+
+
+
+
+
 <a name="1.0.0-beta.3"></a>
 # 1.0.0-beta.3
 🗓 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)

diff --git a/components/actiongroup/package.json b/components/actiongroup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-css/actiongroup",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "description": "The Spectrum CSS actiongroup component",
   "license": "Apache-2.0",
   "main": "dist/index-vars.css",
@@ -20,14 +20,14 @@
     "@spectrum-css/vars": "^2.3.0"
   },
   "devDependencies": {
-    "@spectrum-css/actionbutton": "^1.0.0-beta.0",
-    "@spectrum-css/component-builder": "^1.2.1-beta.0",
-    "@spectrum-css/icon": "^3.0.0-beta.0",
+    "@spectrum-css/button": "^3.0.0-beta.5",
+    "@spectrum-css/component-builder": "^2.0.0-beta.0",
+    "@spectrum-css/icon": "^3.0.0-beta.1",
     "@spectrum-css/vars": "^2.3.0",
     "gulp": "^4.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
   "homepage": "https://opensource.adobe.com/spectrum-css/"
-}
+}
diff --git a/components/actionmenu/CHANGELOG.md b/components/actionmenu/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="3.0.0-beta.5"></a>
+# 3.0.0-beta.5
+🗓 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)
+
+**Note:** Version bump only for package @spectrum-css/actionmenu
+
+
+
+
+
 <a name="3.0.0-beta.4"></a>
 # 3.0.0-beta.4
 🗓 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)

diff --git a/components/actionmenu/package.json b/components/actionmenu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-css/actionmenu",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.5",
   "description": "The Spectrum CSS actionmenu component",
   "license": "Apache-2.0",
   "main": "dist/index-vars.css",
@@ -23,16 +23,16 @@
     "@spectrum-css/vars": "^2.3.0"
   },
   "devDependencies": {
-    "@spectrum-css/actionbutton": "^1.0.0-beta.0",
-    "@spectrum-css/component-builder": "^1.2.1-beta.0",
-    "@spectrum-css/icon": "^3.0.0-beta.0",
-    "@spectrum-css/menu": "^3.0.0-beta.3",
-    "@spectrum-css/popover": "^3.0.0-beta.4",
+    "@spectrum-css/button": "^3.0.0-beta.5",
+    "@spectrum-css/component-builder": "^2.0.0-beta.0",
+    "@spectrum-css/icon": "^3.0.0-beta.1",
+    "@spectrum-css/menu": "^3.0.0-beta.4",
+    "@spectrum-css/popover": "^3.0.0-beta.5",
     "@spectrum-css/vars": "^2.3.0",
     "gulp": "^4.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
   "homepage": "https://opensource.adobe.com/spectrum-css/"
-}
+}
diff --git a/components/asset/CHANGELOG.md b/components/asset/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="3.0.0-beta.4"></a>
+# 3.0.0-beta.4
+🗓 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)
+
+**Note:** Version bump only for package @spectrum-css/asset
+
+
+
+
+
 <a name="3.0.0-beta.3"></a>
 # 3.0.0-beta.3
 🗓 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)

diff --git a/components/asset/package.json b/components/asset/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-css/asset",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0-beta.4",
   "description": "The Spectrum CSS asset component",
   "license": "Apache-2.0",
   "main": "dist/index-vars.css",
@@ -19,7 +19,7 @@
     "@spectrum-css/vars": "^2.3.0"
   },
   "devDependencies": {
-    "@spectrum-css/component-builder": "^1.2.1-beta.0",
+    "@spectrum-css/component-builder": "^2.0.0-beta.0",
     "@spectrum-css/vars": "^2.3.0",
     "gulp": "^4.0.0"
   },

diff --git a/components/assetlist/CHANGELOG.md b/components/assetlist/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="3.0.0-beta.5"></a>
+# 3.0.0-beta.5
+🗓 2020-10-20 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/assetlist@3.0.0-beta.4...@spectrum-css/assetlist@3.0.0-beta.5)
+
+**Note:** Version bump only for package @spectrum-css/assetlist
+
+
+
+
+
 <a name="3.0.0-beta.4"></a>
 # 3.0.0-beta.4
 🗓 2020-09-23 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/assetlist@3.0.0-beta.3...@spectrum-css/assetlist@3.0.0-beta.4)

diff --git a/components/assetlist/package.json b/components/assetlist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-css/assetlist",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.5",
   "description": "The Spectrum CSS assetlist component",
   "license": "Apache-2.0",
   "main": "dist/index-vars.css",
@@ -21,9 +21,9 @@
     "@spectrum-css/vars": "^2.3.0"
   },
   "devDependencies": {
-    "@spectrum-css/checkbox": "^3.0.0-beta.4",
-    "@spectrum-css/component-builder": "^1.2.1-beta.0",
-    "@spectrum-css/icon": "^3.0.0-beta.0",
+    "@spectrum-css/checkbox": "^3.0.0-beta.5",
+    "@spectrum-css/component-builder": "^2.0.0-beta.0",
+    "@spectrum-css/icon": "^3.0.0-beta.1",
     "@spectrum-css/vars": "^2.3.0",
     "gulp": "^4.0.0"
   },

diff --git a/components/avatar/CHANGELOG.md b/components/avatar/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="3.0.0-beta.4"></a>
+# 3.0.0-beta.4
+🗓 2020-10-20 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/avatar@3.0.0-beta.3...@spectrum-css/avatar@3.0.0-beta.4)
+
+**Note:** Version bump only for package @spectrum-css/avatar
+
+
+
+
+
 <a name="3.0.0-beta.3"></a>
 # 3.0.0-beta.3
 🗓 2020-09-23 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/avatar@3.0.0-beta.2...@spectrum-css/avatar@3.0.0-beta.3)

diff --git a/components/avatar/package.json b/components/avatar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-css/avatar",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0-beta.4",
   "description": "The Spectrum CSS avatar component",
   "license": "Apache-2.0",
   "main": "dist/index-vars.css",
@@ -19,7 +19,7 @@
     "@spectrum-css/vars": "^2.3.0"
   },
   "devDependencies": {
-    "@spectrum-css/component-builder": "^1.2.1-beta.0",
+    "@spectrum-css/component-builder": "^2.0.0-beta.0",
     "@spectrum-css/vars": "^2.3.0",
     "gulp": "^4.0.0"
   },

diff --git a/components/breadcrumb/CHANGELOG.md b/components/breadcrumb/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="3.0.0-beta.5"></a>
+# 3.0.0-beta.5
+🗓 2020-10-20 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/breadcrumb@3.0.0-beta.4...@spectrum-css/breadcrumb@3.0.0-beta.5)
+
+**Note:** Version bump only for package @spectrum-css/breadcrumb
+
+
+
+
+
 <a name="3.0.0-beta.4"></a>
 # 3.0.0-beta.4
 🗓 2020-09-23 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/breadcrumb@3.0.0-beta.3...@spectrum-css/breadcrumb@3.0.0-beta.4)

diff --git a/components/breadcrumb/package.json b/components/breadcrumb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-css/breadcrumb",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.5",
   "description": "The Spectrum CSS breadcrumb component",
   "license": "Apache-2.0",
   "main": "dist/index-vars.css",
@@ -21,14 +21,14 @@
     "@spectrum-css/vars": "^2.3.0"
   },
   "devDependencies": {
-    "@spectrum-css/actionbutton": "^1.0.0-beta.0",
-    "@spectrum-css/component-builder": "^1.2.1-beta.0",
-    "@spectrum-css/icon": "^3.0.0-beta.0",
+    "@spectrum-css/button": "^3.0.0-beta.5",
+    "@spectrum-css/component-builder": "^2.0.0-beta.0",
+    "@spectrum-css/icon": "^3.0.0-beta.1",
     "@spectrum-css/vars": "^2.3.0",
     "gulp": "^4.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
   "homepage": "https://opensource.adobe.com/spectrum-css/"
-}
+}
diff --git a/components/button/CHANGELOG.md b/components/button/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="3.0.0-beta.5"></a>
+# 3.0.0-beta.5
+🗓 2020-10-20 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/button@3.0.0-beta.4...@spectrum-css/button@3.0.0-beta.5)
+
+**Note:** Version bump only for package @spectrum-css/button
+
+
+
+
+
 <a name="3.0.0-beta.4"></a>
 # 3.0.0-beta.4
 🗓 2020-09-23 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/button@3.0.0-beta.3...@spectrum-css/button@3.0.0-beta.4)

diff --git a/components/button/package.json b/components/button/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-css/button",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.5",
   "description": "The Spectrum CSS button component",
   "license": "Apache-2.0",
   "main": "dist/index-vars.css",
@@ -19,8 +19,8 @@
     "@spectrum-css/vars": "^2.3.0"
   },
   "devDependencies": {
-    "@spectrum-css/component-builder": "^1.2.1-beta.0",
-    "@spectrum-css/icon": "^3.0.0-beta.0",
+    "@spectrum-css/component-builder": "^2.0.0-beta.0",
+    "@spectrum-css/icon": "^3.0.0-beta.1",
     "@spectrum-css/vars": "^2.3.0",
     "gulp": "^4.0.0"
   },

diff --git a/components/buttongroup/CHANGELOG.md b/components/buttongroup/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="3.0.0-beta.5"></a>
+# 3.0.0-beta.5
+🗓 2020-10-20 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/buttongroup@3.0.0-beta.4...@spectrum-css/buttongroup@3.0.0-beta.5)
+
+**Note:** Version bump only for package @spectrum-css/buttongroup
+
+
+
+
+
 <a name="3.0.0-beta.4"></a>
 # 3.0.0-beta.4
 🗓 2020-09-23 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/buttongroup@3.0.0-beta.3...@spectrum-css/buttongroup@3.0.0-beta.4)