From b9fde6d0ef0bba76d4f7ff66b2a5f250c2a9c52a Mon Sep 17 00:00:00 2001
From: codebender828 <jbakebwa@163.com>
Date: Wed, 31 Mar 2021 21:05:55 +0800
Subject: [PATCH 1/2] Merge branch 'master' of
 github.com:chakra-ui/chakra-ui-vue into develop

---
 .changeset/config.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.changeset/config.json b/.changeset/config.json
index 312c868f..7a509902 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -8,5 +8,6 @@
   "linked": [],
   "access": "public",
   "baseBranch": "master",
-  "updateInternalDependencies": "patch"
+  "updateInternalDependencies": "patch",
+  "ignore": []
 }
\ No newline at end of file

From e5ad5565f6b3e9b20e397aba1aebd1ffcad8da45 Mon Sep 17 00:00:00 2001
From: codebender828 <jbakebwa@163.com>
Date: Wed, 31 Mar 2021 21:33:59 +0800
Subject: [PATCH 2/2] fix(closebutton): remove color prop

---
 packages/chakra-ui-core/src/CCloseButton/CCloseButton.js      | 1 -
 .../src/CCloseButton/utils/closebutton.props.js               | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/packages/chakra-ui-core/src/CCloseButton/CCloseButton.js b/packages/chakra-ui-core/src/CCloseButton/CCloseButton.js
index cf87c888..96f66367 100644
--- a/packages/chakra-ui-core/src/CCloseButton/CCloseButton.js
+++ b/packages/chakra-ui-core/src/CCloseButton/CCloseButton.js
@@ -78,7 +78,6 @@ const CCloseButton = {
       }
     }, [h(CIcon, {
       props: {
-        color: props.color,
         name: 'close',
         size: iconSize
       },
diff --git a/packages/chakra-ui-core/src/CCloseButton/utils/closebutton.props.js b/packages/chakra-ui-core/src/CCloseButton/utils/closebutton.props.js
index 0afa1ff8..141cac75 100644
--- a/packages/chakra-ui-core/src/CCloseButton/utils/closebutton.props.js
+++ b/packages/chakra-ui-core/src/CCloseButton/utils/closebutton.props.js
@@ -8,10 +8,6 @@ export default {
     type: Boolean,
     default: false
   },
-  color: {
-    type: String,
-    default: 'currentColor'
-  },
   ariaLabel: {
     type: String,
     default: 'Close'