diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss index 93bc1b6de..4b52e7775 100644 --- a/app/src/assets/scss/base.scss +++ b/app/src/assets/scss/base.scss @@ -37,50 +37,17 @@ /* .status: 2 -// 需小于 .block__popover -// 需小于 ctrl+p https://github.com/siyuan-note/siyuan/issues/7174 .protyle-util: 4 -// 引用提示需小于 .block__popover -.protyle-hint: 201 +.protyle-hint: 5 -// 需小于 .block__popover https://github.com/siyuan-note/siyuan/issues/3515 -// 需大于 .protyle-hint https://github.com/siyuan-note/siyuan/pull/7247 -ctrl+p 搜索: 202 +#menu & .side-panel: 6 -// 需小于 .b3-menu 悬浮窗点击更多 -// 需小于 .b3-dialog https://ld246.com/article/1637204682648 -.block__popover: 205 -.block__popover--top: 206 +#windowControls: 999998 -// 需小于 .b3-menu -.av__panel: 209 +.b3-snackbar: 999999 -// 需大于 .block__popover -.b3-menu: 210 - -// 需小于 .b3-dialog 关于中的锁屏密码设置 -#menu & .side-panel: 220 - -// 需小于 #windowControls -// 需大于 .protyle-util https://github.com/siyuan-note/siyuan/issues/5069 -.b3-dialog: 305 - -// 需大于 mobile .status、.b3-dialog -.keyboard: 306 - -// 历史中切换笔记本需临时大于 .b3-dialog https://github.com/siyuan-note/siyuan/issues/5107 -// 移动端排序和菜单需临时大于 .side-panel https://github.com/siyuan-note/siyuan/issues/5254 -.b3-menu: 310 - -.av__mask: 320 - -// 需大于 .b3-dialog -progressLoading: 400 - -#windowControls: 502 - -.b3-snackbar: 503 +.b3-tooltips: 1000000 */ html { @@ -151,7 +118,7 @@ html { #windowControls { top: 0; - z-index: 502; + z-index: 999998; right: 0; position: relative; margin-left: 2px; diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss index a6cf98dc1..08e1db3c1 100644 --- a/app/src/assets/scss/business/_av.scss +++ b/app/src/assets/scss/business/_av.scss @@ -47,7 +47,6 @@ &__mask { position: fixed; - z-index: 320; top: 0; bottom: 0; right: 0; @@ -264,7 +263,6 @@ } &__panel { - z-index: 209; position: relative; .b3-menu { diff --git a/app/src/assets/scss/business/_block.scss b/app/src/assets/scss/business/_block.scss index adef37d00..76e8c45a9 100644 --- a/app/src/assets/scss/business/_block.scss +++ b/app/src/assets/scss/business/_block.scss @@ -17,11 +17,6 @@ &--open { opacity: 1; - z-index: 205; - } - - &--top.block__popover--open { - z-index: 206; } & > .block__icons { diff --git a/app/src/assets/scss/business/_search.scss b/app/src/assets/scss/business/_search.scss index 0a542ad80..bb0c8ede6 100644 --- a/app/src/assets/scss/business/_search.scss +++ b/app/src/assets/scss/business/_search.scss @@ -61,6 +61,7 @@ top: 42px; position: absolute; left: 8px; + z-index: 1; } } diff --git a/app/src/assets/scss/component/_dialog.scss b/app/src/assets/scss/component/_dialog.scss index cf764f26b..957752813 100644 --- a/app/src/assets/scss/component/_dialog.scss +++ b/app/src/assets/scss/component/_dialog.scss @@ -8,7 +8,6 @@ width: 100%; height: 100%; display: flex; - z-index: 305; &--open { .b3-dialog__scrim { diff --git a/app/src/assets/scss/component/_menu.scss b/app/src/assets/scss/component/_menu.scss index 536b30880..d4315d0bf 100644 --- a/app/src/assets/scss/component/_menu.scss +++ b/app/src/assets/scss/component/_menu.scss @@ -5,7 +5,6 @@ border: 1px solid var(--b3-theme-surface-lighter); background-color: var(--b3-menu-background); padding: 8px 0; - z-index: 210; box-sizing: border-box; &::-webkit-scrollbar, diff --git a/app/src/assets/scss/component/_snackbar.scss b/app/src/assets/scss/component/_snackbar.scss index 29942496e..117473b4b 100644 --- a/app/src/assets/scss/component/_snackbar.scss +++ b/app/src/assets/scss/component/_snackbar.scss @@ -12,7 +12,7 @@ position: fixed; right: 12px; top: 22px; - z-index: 503; + z-index: 999999; max-height: calc(100vh - 32px); display: flex; flex-direction: column; diff --git a/app/src/assets/scss/mobile.scss b/app/src/assets/scss/mobile.scss index 702aff4f3..3bb1a0b3c 100644 --- a/app/src/assets/scss/mobile.scss +++ b/app/src/assets/scss/mobile.scss @@ -156,7 +156,7 @@ background-color: var(--b3-theme-surface); height: 100vh; width: 100vw; - z-index: 220; + z-index: 6; transform: translateX(-100vw); transition: transform 0.15s cubic-bezier(0, 0, 0.2, 1) 0ms; @@ -239,7 +239,7 @@ } #menu { - z-index: 220; + z-index: 6; transform: translateX(100vw); top: 0; @@ -261,7 +261,6 @@ box-sizing: border-box; height: 42px; background: var(--b3-theme-background); - z-index: 306; display: flex; border-top: 1px solid var(--b3-theme-surface-lighter); overflow: hidden; diff --git a/app/src/assets/scss/pdf/_pdf.scss b/app/src/assets/scss/pdf/_pdf.scss index e1638fb29..05a7b6c01 100644 --- a/app/src/assets/scss/pdf/_pdf.scss +++ b/app/src/assets/scss/pdf/_pdf.scss @@ -321,6 +321,7 @@ align-items: center; flex-wrap: wrap; overflow: initial; + z-index: 1; #findInput { width: 120px; @@ -337,6 +338,7 @@ top: 36px; overflow: auto; -webkit-overflow-scrolling: touch; + z-index: 1; .b3-menu__items { max-height: 60vh; diff --git a/app/src/assets/scss/protyle/_toolbar.scss b/app/src/assets/scss/protyle/_toolbar.scss index 10ee60669..ab0980674 100644 --- a/app/src/assets/scss/protyle/_toolbar.scss +++ b/app/src/assets/scss/protyle/_toolbar.scss @@ -52,7 +52,7 @@ box-shadow: var(--b3-dialog-shadow); border: 1px solid var(--b3-theme-surface-lighter); background-color: var(--b3-menu-background); - z-index: 201; + z-index: 5; overflow: auto; max-height: 402px; box-sizing: border-box; diff --git a/app/src/block/Panel.ts b/app/src/block/Panel.ts index 01c8f61fb..13ea77223 100644 --- a/app/src/block/Panel.ts +++ b/app/src/block/Panel.ts @@ -49,7 +49,8 @@ export class BlockPanel { this.isBacklink = options.isBacklink; this.element = document.createElement("div"); - this.element.classList.add("block__popover", "block__popover--top"); + this.element.style.zIndex = (++window.siyuan.zIndex).toString(); + this.element.classList.add("block__popover"); const parentElement = hasClosestByClassName(this.targetElement, "block__popover", true); let level = 1; @@ -95,11 +96,8 @@ export class BlockPanel { } }); this.element.addEventListener("click", (event) => { - document.querySelectorAll(".block__popover--top").forEach(item => { - item.classList.remove("block__popover--top"); - }); if (this.element && window.siyuan.blockPanels.length > 1) { - this.element.classList.add("block__popover--top"); + this.element.style.zIndex = (++window.siyuan.zIndex).toString(); } let target = event.target as HTMLElement; diff --git a/app/src/dialog/index.ts b/app/src/dialog/index.ts index eff784626..3cec6e63b 100644 --- a/app/src/dialog/index.ts +++ b/app/src/dialog/index.ts @@ -27,7 +27,7 @@ export class Dialog { this.destroyCallback = options.destroyCallback; this.element = document.createElement("div") as HTMLElement; - this.element.innerHTML = `