Merge branch 'dev' into feat/selectChildren

cengage · Nov 9, 2023 · 56babe8 · 56babe8
2 parents 7a2c960 + 4c65469
commit 56babe8
Show file tree

Hide file tree

Showing 36 changed files with 671 additions and 13,910 deletions.
diff --git a/.changeset/chartColors.md b/.changeset/chartColors.md
@@ -0,0 +1,5 @@
+---
+'react-magma-dom': patch
+---
+
+Adding in chartColors to theme.
diff --git a/.changeset/cuddly-dolphins-yell.md b/.changeset/cuddly-dolphins-yell.md
@@ -0,0 +1,5 @@
+---
+"react-magma-docs": patch
+---
+
+build: Resolve merge conflicts when pulling main -> dev
diff --git a/.changeset/dropdown-menuItemRole.md b/.changeset/dropdown-menuItemRole.md
diff --git a/.changeset/dropdownContent-falseChild.md b/.changeset/dropdownContent-falseChild.md
diff --git a/.changeset/feat-dropdownExpandableMenu.md b/.changeset/feat-dropdownExpandableMenu.md
diff --git a/.changeset/feat-optionalPerPageSelect.md b/.changeset/feat-optionalPerPageSelect.md
diff --git a/.changeset/fix-datePickerEscape.md b/.changeset/fix-datePickerEscape.md
diff --git a/.changeset/fix-dropdownDocsStorybook.md b/.changeset/fix-dropdownDocsStorybook.md
diff --git a/.changeset/fix-expandableDropdown.md b/.changeset/fix-expandableDropdown.md
diff --git a/.changeset/fix-expandableDropdownDisabled.md b/.changeset/fix-expandableDropdownDisabled.md
diff --git a/.changeset/fix-labelsColors.md b/.changeset/fix-labelsColors.md
diff --git a/.changeset/fix-modalEscape.md b/.changeset/fix-modalEscape.md
diff --git a/.changeset/fix-passInputLarge.md b/.changeset/fix-passInputLarge.md
diff --git a/.changeset/fix-radioGroup.md b/.changeset/fix-radioGroup.md
diff --git a/.changeset/fix-subPageTabs b/.changeset/fix-subPageTabs
diff --git a/.changeset/inputHeight.md b/.changeset/inputHeight.md
diff --git a/.changeset/loud-poets-eat.md b/.changeset/loud-poets-eat.md
@@ -0,0 +1,5 @@
+---
+"react-magma-dom": patch
+---
+
+build(deps): bump browserify-sign from 4.2.1 to 4.2.2
diff --git a/.changeset/nativeSelectHeight.md b/.changeset/nativeSelectHeight.md
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -11,21 +11,8 @@
     "react-magma-landing": "1.1.2"
   },
   "changesets": [
-    "dropdown-menuItemRole",
-    "dropdownContent-falseChild",
-    "feat-dropdownExpandableMenu",
-    "feat-optionalPerPageSelect",
-    "fix-datePickerEscape",
-    "fix-dropdownDocsStorybook",
-    "fix-expandableDropdown",
-    "fix-expandableDropdownDisabled",
-    "fix-labelsColors",
-    "fix-modalEscape",
-    "fix-passInputLarge",
-    "fix-radioGroup",
-    "inputHeight",
-    "nativeSelectHeight",
-    "sortArrows",
-    "update-modalPadding"
+    "chartColors",
+    "cuddly-dolphins-yell",
+    "loud-poets-eat"
   ]
 }
diff --git a/.changeset/sortArrows.md b/.changeset/sortArrows.md
diff --git a/.changeset/update-modalPadding.md b/.changeset/update-modalPadding.md