profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

Browse source
This commit is contained in:
syuilo 2022-12-27 14:25:23 +09:00
commit 6caf7d7f20
4 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
packages/client/src/pages/user/clips.vue
View file

@ -1,12 +1,14 @@
<template> <template>
<div> <MkSpacer :content-max="700">
<MkPagination v-slot="{items}" ref="list" :pagination="pagination"> <div class="pages-user-clips">
<MkPagination v-slot="{items}" ref="list" :pagination="pagination" class="list">
<MkA v-for="item in items" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap"> <MkA v-for="item in items" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap">
<b>{{ item.name }}</b> <b>{{ item.name }}</b>
<div v-if="item.description" class="description">{{ item.description }}</div> <div v-if="item.description" class="description">{{ item.description }}</div>
</MkA> </MkA>
</MkPagination> </MkPagination>
</div> </div>
</MkSpacer>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
@ -28,5 +30,18 @@ const pagination = {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.pages-user-clips {
> .list {
> .item {
display: block;
padding: 16px;
> .description {
margin-top: 8px;
padding-top: 8px;
border-top: solid 0.5px var(--divider);
}
}
}
}
</style> </style>

4
packages/client/src/pages/user/gallery.vue
View file

@ -1,11 +1,11 @@
<template> <template>
<div> <MkSpacer :content-max="700">
<MkPagination v-slot="{items}" :pagination="pagination"> <MkPagination v-slot="{items}" :pagination="pagination">
<div class="jrnovfpt"> <div class="jrnovfpt">
<MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/> <MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/>
</div> </div>
</MkPagination> </MkPagination>
</div> </MkSpacer>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>

4
packages/client/src/pages/user/pages.vue
View file

@ -1,9 +1,9 @@
<template> <template>
<div> <MkSpacer :content-max="700">
<MkPagination v-slot="{items}" ref="list" :pagination="pagination"> <MkPagination v-slot="{items}" ref="list" :pagination="pagination">
<MkPagePreview v-for="page in items" :key="page.id" :page="page" class="_gap"/> <MkPagePreview v-for="page in items" :key="page.id" :page="page" class="_gap"/>
</MkPagination> </MkPagination>
</div> </MkSpacer>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>

4
packages/client/src/pages/user/reactions.vue
View file

@ -1,5 +1,5 @@
<template> <template>
<div> <MkSpacer :content-max="700">
<MkPagination v-slot="{items}" ref="list" :pagination="pagination"> <MkPagination v-slot="{items}" ref="list" :pagination="pagination">
<div v-for="item in items" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap afdcfbfb"> <div v-for="item in items" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap afdcfbfb">
<div class="header"> <div class="header">
@ -10,7 +10,7 @@
<MkNote :key="item.id" :note="item.note"/> <MkNote :key="item.id" :note="item.note"/>
</div> </div>
</MkPagination> </MkPagination>
</div> </MkSpacer>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>