From aec00ec3a6711ae168b4dd1e3805e88cfd9a1c10 Mon Sep 17 00:00:00 2001
From: xiezongchen <952937570@qq.com>
Date: Sat, 18 Sep 2021 15:21:39 +0800
Subject: [PATCH] fix(badge): fix n-button border on hover conflicts with
 n-badge

---
 CHANGELOG.en-US.md                 | 5 ++---
 CHANGELOG.zh-CN.md                 | 7 +++----
 src/badge/src/styles/index.cssr.ts | 1 +
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 9c9d022c05f..f035ebbb0a6 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -1,8 +1,5 @@
 # CHANGELOG
 
-### Feats
-
-- `n-menu` add `accordion` prop , closes [#917](https://github.com/TuSimple/naive-ui/issues/917).
 ## Pending
 
 ### Breaking Changes
@@ -12,10 +9,12 @@
 ### Feats
 
 - `n-layout-sider` add `collapsed-trigger-style` prop.
+- `n-menu` add `accordion` prop , closes [#917](https://github.com/TuSimple/naive-ui/issues/917).
 
 ### Fixes
 
 - Fix `n-select` focus input when closing tag with `filterable` , closes [#1170](https://github.com/TuSimple/naive-ui/issues/1170).
+- Fix `n-button` border on hover conflicts with `n-badge`, closes [#1195](https://github.com/TuSimple/naive-ui/issues/1195).
 
 ## 2.18.2 (2021-09-14)
 
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 83df5635a62..4005b642cdd 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -1,8 +1,5 @@
 # CHANGELOG
 
-### Feats
-
-- `n-menu` 添加 `accordion` 属性，关闭 [#917](https://github.com/TuSimple/naive-ui/issues/917)
 ## Pending
 
 ### Breaking Changes
@@ -12,10 +9,12 @@
 ### Feats
 
 - `n-layout-sider` 新增 `collapsed-trigger-style` 属性
+- `n-menu` 添加 `accordion` 属性，关闭 [#917](https://github.com/TuSimple/naive-ui/issues/917)
 
 ### Fixes
 
 - 修复 `n-select` `filterable` 下关闭标签 input 光标聚焦问题，关闭 [#1170](https://github.com/TuSimple/naive-ui/issues/1170)
+- 修复 `n-button` 在 hover 状态下边框与 `n-badge` 冲突，关闭 [#1195](https://github.com/TuSimple/naive-ui/issues/1195)
 
 ## 2.18.2 (2021-09-14)
 
@@ -1432,4 +1431,4 @@
 
 ### Feats
 
-- `n-data-table` 增加了 empty 插槽 [#86](https://github.com/TuSimple/naive-ui/issues/86)
\ No newline at end of file
+- `n-data-table` 增加了 empty 插槽 [#86](https://github.com/TuSimple/naive-ui/issues/86)
diff --git a/src/badge/src/styles/index.cssr.ts b/src/badge/src/styles/index.cssr.ts
index c7f0976254f..6c8b324ab5f 100644
--- a/src/badge/src/styles/index.cssr.ts
+++ b/src/badge/src/styles/index.cssr.ts
@@ -69,6 +69,7 @@ export default c([
       left: 100%;
       bottom: calc(100% - 9px);
       font-variant-numeric: tabular-nums;
+      z-index: 1;
     `,
     [
       fadeInScaleUpTransition({