Skip to content

Commit

Permalink
🎨
Browse files Browse the repository at this point in the history
  • Loading branch information
syuilo committed Dec 30, 2022
1 parent 632c7d2 commit 93d3cc3
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 13 deletions.
15 changes: 14 additions & 1 deletion packages/frontend/src/components/MkReactionsViewer.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<template>
<div class="tdflqwzn" :class="{ isMe }">
<XReaction v-for="(count, reaction) in note.reactions" :key="reaction" :reaction="reaction" :count="count" :is-initial="initialReactions.has(reaction)" :note="note"/>
<TransitionGroup :name="$store.state.animation ? 'x' : ''">
<XReaction v-for="(count, reaction) in note.reactions" :key="reaction" :reaction="reaction" :count="count" :is-initial="initialReactions.has(reaction)" :note="note"/>
</TransitionGroup>
</div>
</template>

Expand All @@ -20,6 +22,17 @@ const isMe = computed(() => $i && $i.id === props.note.userId);
</script>

<style lang="scss" scoped>
.x-move, .x-enter-active, .x-leave-active {
transition: opacity 0.2s cubic-bezier(0,.5,.5,1), transform 0.2s cubic-bezier(0,.5,.5,1) !important;
}
.x-enter-from, .x-leave-to {
opacity: 0;
transform: scale(0.7);
}
.x-leave-active {
position: absolute;
}
.tdflqwzn {
margin: 4px -2px 0 -2px;
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkUrlPreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<iframe ref="tweet" scrolling="no" frameborder="no" :style="{ position: 'relative', width: '100%', height: `${tweetHeight}px` }" :src="`https://platform.twitter.com/embed/index.html?embedId=${embedId}&amp;hideCard=false&amp;hideThread=false&amp;lang=en&amp;theme=${$store.state.darkMode ? 'dark' : 'light'}&amp;id=${tweetId}`"></iframe>
</div>
<div v-else class="mk-url-preview">
<Transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
<component :is="self ? 'MkA' : 'a'" v-if="!fetching" class="link" :class="{ compact }" :[attr]="self ? url.substr(local.length) : url" rel="nofollow noopener" :target="target" :title="url">
<div v-if="thumbnail" class="thumbnail" :style="`background-image: url('${thumbnail}')`">
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkUrlPreviewPopup.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="fgmtyycl" :style="{ zIndex, top: top + 'px', left: left + 'px' }">
<Transition :name="$store.state.animation ? 'zoom' : ''" @after-leave="emit('closed')">
<Transition :name="$store.state.animation ? '_transition_zoom' : ''" @after-leave="emit('closed')">
<MkUrlPreview v-if="showing" class="_popup _shadow" :url="url"/>
</Transition>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/global/MkError.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<Transition :name="$store.state.animation ? 'zoom' : ''" appear>
<Transition :name="$store.state.animation ? '_transition_zoom' : ''" appear>
<div class="mjndxjcg">
<img src="https://xn--931a.moe/assets/error.jpg" class="_ghost"/>
<p><i class="ti ti-alert-triangle"></i> {{ i18n.ts.somethingHappened }}</p>
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/pages/_error_.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<MkLoading v-if="!loaded"/>
<Transition :name="$store.state.animation ? 'zoom' : ''" appear>
<Transition :name="$store.state.animation ? '_transition_zoom' : ''" appear>
<div v-show="loaded" class="mjndxjch">
<img src="https://xn--931a.moe/assets/error.jpg" class="_ghost"/>
<p><b><i class="ti ti-alert-triangle"></i> {{ i18n.ts.pageLoadError }}</b></p>
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/pages/admin/overview.instances.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="wbrkwale">
<Transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
<MkLoading v-if="fetching"/>
<div v-else class="instances">
<MkA v-for="(instance, i) in instances" :key="instance.id" v-tooltip.mfm.noDelay="`${instance.name}\n${instance.host}\n${instance.softwareName} ${instance.softwareVersion}`" :to="`/instance-info/${instance.host}`" class="instance">
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/pages/admin/overview.moderators.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<Transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
<MkLoading v-if="fetching"/>
<div v-else :class="$style.root" class="_panel">
<MkA v-for="user in moderators" :key="user.id" class="user" :to="`/user-info/${user.id}`">
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/pages/admin/overview.stats.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<Transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
<MkLoading v-if="fetching"/>
<div v-else :class="$style.root">
<div class="item _panel users">
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/pages/admin/overview.users.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div :class="$style.root">
<Transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
<MkLoading v-if="fetching"/>
<div v-else class="users">
<MkA v-for="(user, i) in newUsers" :key="user.id" :to="`/user-info/${user.id}`" class="user">
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/src/pages/my-lists/list.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
<MkSpacer :content-max="700">
<div class="mk-list-page">
<Transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
<div v-if="list" class="_section">
<div class="_content">
<MkButton inline @click="addUser()">{{ i18n.ts.addUser }}</MkButton>
Expand All @@ -13,7 +13,7 @@
</div>
</Transition>

<Transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
<Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in">
<div v-if="list" class="_section members _gap">
<div class="_title">{{ i18n.ts.members }}</div>
<div class="_content">
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/src/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -512,10 +512,10 @@ hr {
transition-timing-function: cubic-bezier(0,.5,.5,1);
}

.zoom-enter-active, .zoom-leave-active {
._transition_zoom-enter-active, ._transition_zoom-leave-active {
transition: opacity 0.5s, transform 0.5s !important;
}
.zoom-enter-from, .zoom-leave-to {
._transition_zoom-enter-from, ._transition_zoom-leave-to {
opacity: 0;
transform: scale(0.9);
}
Expand Down

0 comments on commit 93d3cc3

Please sign in to comment.