From be7e389bb5d9b1028013c8e466e31fd2010228cf Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 14 May 2021 10:49:54 +0900 Subject: [PATCH 01/12] Revert "fix bug" This reverts commit 5b250c15f8af1e0afc9dc60f23269582e9c17ef4. --- src/client/components/ui/modal.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/components/ui/modal.vue b/src/client/components/ui/modal.vue index 2a4eec4034..3b11213426 100644 --- a/src/client/components/ui/modal.vue +++ b/src/client/components/ui/modal.vue @@ -226,12 +226,12 @@ export default defineComponent({ .mk-modal { > .bg { - z-index: 20000; + z-index: 10000; } > .content:not(.popup) { position: fixed; - z-index: 20000; + z-index: 10000; top: 0; bottom: 0; left: 0; @@ -263,7 +263,7 @@ export default defineComponent({ > .content.popup { position: absolute; - z-index: 20000; + z-index: 10000; &.fixed { position: fixed; From d7522757302ff2a9378a86bedfbe3285c07a730a Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 14 May 2021 11:04:21 +0900 Subject: [PATCH 02/12] fix bug --- src/client/components/emoji-picker-dialog.vue | 2 +- src/client/components/ui/modal.vue | 23 +++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/client/components/emoji-picker-dialog.vue b/src/client/components/emoji-picker-dialog.vue index c4b12e2f61..9400819a1f 100644 --- a/src/client/components/emoji-picker-dialog.vue +++ b/src/client/components/emoji-picker-dialog.vue @@ -1,5 +1,5 @@ diff --git a/src/client/components/ui/modal.vue b/src/client/components/ui/modal.vue index 3b11213426..33fcdb687f 100644 --- a/src/client/components/ui/modal.vue +++ b/src/client/components/ui/modal.vue @@ -1,6 +1,6 @@