diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 28289edbd2..a3c343b9c4 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -52,3 +52,4 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: docs/.vitepress/dist + publish_branch: gh-pages # 将部署到 gh-pages 分支 diff --git a/CHANGELOG.md b/CHANGELOG.md index 673d12bda3..2a0991d474 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ 中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md) +- 优化 `f-drawer` `f-dialog` 组件样式 + ## 0.60.0 (2023-08-04) - 优化 `f-radio` 组件样式 diff --git a/docs/CNAME b/docs/CNAME new file mode 100644 index 0000000000..74aa439d78 --- /dev/null +++ b/docs/CNAME @@ -0,0 +1 @@ +fighting.tianyuhao.cn diff --git a/docs/components/demos/drawer/demo1.vue b/docs/components/demos/drawer/demo1.vue deleted file mode 100644 index 1045da331f..0000000000 --- a/docs/components/demos/drawer/demo1.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - diff --git a/docs/components/demos/drawer/demo2.vue b/docs/components/demos/drawer/demo2.vue deleted file mode 100644 index db6b955bfc..0000000000 --- a/docs/components/demos/drawer/demo2.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - diff --git a/docs/components/drawer.md b/docs/components/drawer.md index 03335faa4f..08785c8bea 100644 --- a/docs/components/drawer.md +++ b/docs/components/drawer.md @@ -12,7 +12,28 @@ ::: demo ```html @@ -64,24 +85,31 @@ ::: demo ```html ``` @@ -143,6 +171,15 @@ type DrawerDirection = 'left' | 'top' | 'right' | 'bottom' diff --git a/packages/fighting-theme/src/dialog.scss b/packages/fighting-theme/src/dialog.scss index e6e8fc21b4..9d42a39903 100644 --- a/packages/fighting-theme/src/dialog.scss +++ b/packages/fighting-theme/src/dialog.scss @@ -4,7 +4,7 @@ right: 0; left: 0; bottom: 0; - z-index: var(--dialog-z-index); + z-index: var(--dialog-z-index, 2000); // 遮罩层 &__mask { diff --git a/packages/fighting-theme/src/drawer.scss b/packages/fighting-theme/src/drawer.scss index 84cb617928..19fd62b091 100644 --- a/packages/fighting-theme/src/drawer.scss +++ b/packages/fighting-theme/src/drawer.scss @@ -4,7 +4,7 @@ right: 0; left: 0; bottom: 0; - z-index: var(--drawer-z-index); + z-index: var(--drawer-z-index, 2000); // 不同方向 &__top .f-drawer__container {