summaryrefslogtreecommitdiff
path: root/src/client/components/ui
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-08-17 22:01:46 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-08-17 22:01:46 +0900
commitdf67836c1ad281d2622b52bdf7c767b2dfc0e6a5 (patch)
tree5a2c4e5b681857d846d5fea1f4058b72e80651da /src/client/components/ui
parentMerge branch 'develop' (diff)
parentMerge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff)
downloadmisskey-df67836c1ad281d2622b52bdf7c767b2dfc0e6a5.tar.gz
misskey-df67836c1ad281d2622b52bdf7c767b2dfc0e6a5.tar.bz2
misskey-df67836c1ad281d2622b52bdf7c767b2dfc0e6a5.zip
Merge branch 'develop'
Diffstat (limited to 'src/client/components/ui')
-rw-r--r--src/client/components/ui/popup.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/components/ui/popup.vue b/src/client/components/ui/popup.vue
index 9e360411c0..8497eedecb 100644
--- a/src/client/components/ui/popup.vue
+++ b/src/client/components/ui/popup.vue
@@ -1,5 +1,5 @@
<template>
-<transition :name="$store.state.animation ? 'popup-menu' : ''" :duration="$store.state.animation ? 300 : 0" appear @after-leave="onClosed" @enter="$emit('opening')" @after-enter="childRendered">
+<transition :name="$store.state.animation ? 'popup-menu' : ''" appear @after-leave="onClosed" @enter="$emit('opening')" @after-enter="childRendered">
<div v-show="manualShowing != null ? manualShowing : showing" class="ccczpooj" :class="{ front, fixed, top: position === 'top' }" ref="content" :style="{ pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }">
<slot :point="point"></slot>
</div>