diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 5d3573aed0f..6d39f28a29a 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -2,15 +2,16 @@ ## Pending -### Fixes - -- Fix `n-notification`'s exported `NotificationReactive` type is not writable, closes [#876](https://github.com/TuSimple/naive-ui/issues/876). - ### Feats - `n-input-number` add `clearable` prop. - `n-form` add `show-label` prop, closes [#858](https://github.com/TuSimple/naive-ui/issues/858). +### Fixes + +- Fix `n-notification`'s exported `NotificationReactive` type is not writable, closes [#876](https://github.com/TuSimple/naive-ui/issues/876). +- Fix `n-tabs` style glitches when different types tabs are nested, closes [#850](https://github.com/TuSimple/naive-ui/issues/850). + ## 2.16.4 (2021-08-16) ### Fixes diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index adb33dd5e96..eff1f56c90c 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -2,15 +2,16 @@ ## Pending -### Fixes - -- 修复 `n-notification` 导出的 `NotificationReactive` 类型不可变,关闭 [#876](https://github.com/TuSimple/naive-ui/issues/876) - ### Feats - `n-input-number` 新增 `clearable` 属性 - `n-form` 新增 `show-label` 属性,关闭 [#858](https://github.com/TuSimple/naive-ui/issues/858) +### Fixes + +- 修复 `n-notification` 导出的 `NotificationReactive` 类型不可变,关闭 [#876](https://github.com/TuSimple/naive-ui/issues/876) +- 修复 `n-tabs` 不同类型嵌套样式错乱,关闭 [#850](https://github.com/TuSimple/naive-ui/issues/850) + ## 2.16.4 (2021-08-16) ### Fixes diff --git a/src/tabs/demos/zhCN/index.demo-entry.md b/src/tabs/demos/zhCN/index.demo-entry.md index 2fcc4e8c58e..237171db523 100644 --- a/src/tabs/demos/zhCN/index.demo-entry.md +++ b/src/tabs/demos/zhCN/index.demo-entry.md @@ -13,6 +13,7 @@ prefix display-directive addable line-debug +style-inherit-debug ``` ## Props diff --git a/src/tabs/demos/zhCN/style-inherit-debug.demo.md b/src/tabs/demos/zhCN/style-inherit-debug.demo.md new file mode 100644 index 00000000000..44d07691050 --- /dev/null +++ b/src/tabs/demos/zhCN/style-inherit-debug.demo.md @@ -0,0 +1,34 @@ +# Style Inherit Debug + +```html +