diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-12-17 19:43:00 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-12-17 19:43:00 +0900 |
| commit | 80c88e13ff730ab627787b498f71a0a5ed3c37a1 (patch) | |
| tree | f9a76e2a1cbe983da9845ab77740abb800d18c39 /packages/client/src | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.100.1 (diff) | |
| download | misskey-80c88e13ff730ab627787b498f71a0a5ed3c37a1.tar.gz misskey-80c88e13ff730ab627787b498f71a0a5ed3c37a1.tar.bz2 misskey-80c88e13ff730ab627787b498f71a0a5ed3c37a1.zip | |
Merge branch 'develop'
Diffstat (limited to 'packages/client/src')
| -rw-r--r-- | packages/client/src/components/toast.vue | 2 | ||||
| -rw-r--r-- | packages/client/src/components/ui/modal.vue | 2 | ||||
| -rw-r--r-- | packages/client/src/components/waiting-dialog.vue | 2 | ||||
| -rw-r--r-- | packages/client/src/ui/_common_/common.vue | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/packages/client/src/components/toast.vue b/packages/client/src/components/toast.vue index a04cf764ad..6561ba3854 100644 --- a/packages/client/src/components/toast.vue +++ b/packages/client/src/components/toast.vue @@ -1,5 +1,5 @@ <template> -<div class="mk-toast" style="{ zIndex }"> +<div class="mk-toast" :style="{ zIndex }"> <transition name="notification-slide" appear @after-leave="$emit('closed')"> <XNotification v-if="showing" :notification="notification" class="notification _acrylic"/> </transition> diff --git a/packages/client/src/components/ui/modal.vue b/packages/client/src/components/ui/modal.vue index b875d01c07..81394be63f 100644 --- a/packages/client/src/components/ui/modal.vue +++ b/packages/client/src/components/ui/modal.vue @@ -102,7 +102,7 @@ export default defineComponent({ }; if (type.value === 'drawer') { - maxHeight.value = window.innerHeight - 100; + maxHeight.value = window.innerHeight / 2; } const keymap = { diff --git a/packages/client/src/components/waiting-dialog.vue b/packages/client/src/components/waiting-dialog.vue index 206f7d0c5a..e9ca3b33b9 100644 --- a/packages/client/src/components/waiting-dialog.vue +++ b/packages/client/src/components/waiting-dialog.vue @@ -1,5 +1,5 @@ <template> -<MkModal ref="modal" @click="success ? done() : () => {}" @closed="$emit('closed')"> +<MkModal ref="modal" :prefer-type="'dialog'" @click="success ? done() : () => {}" @closed="$emit('closed')"> <div class="iuyakobc" :class="{ iconOnly: (text == null) || success }"> <i v-if="success" class="fas fa-check icon success"></i> <i v-else class="fas fa-spinner fa-pulse icon waiting"></i> diff --git a/packages/client/src/ui/_common_/common.vue b/packages/client/src/ui/_common_/common.vue index f7242dd86a..4f93cf5e77 100644 --- a/packages/client/src/ui/_common_/common.vue +++ b/packages/client/src/ui/_common_/common.vue @@ -60,7 +60,7 @@ export default defineComponent({ #wait { display: block; position: fixed; - z-index: 10000; + z-index: 3000000; top: 15px; right: 15px; |