mirror of
https://github.com/paricafe/misskey.git
synced 2024-11-24 04:46:43 -06:00
Merge branch 'develop' into pari
This commit is contained in:
commit
5a64e7ae5c
2 changed files with 5 additions and 3 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -68,6 +68,8 @@ misskey-assets
|
|||
# Vite temporary files
|
||||
vite.config.js.timestamp-*
|
||||
vite.config.ts.timestamp-*
|
||||
vite.config.local-dev.js.timestamp-*
|
||||
vite.config.local-dev.ts.timestamp-*
|
||||
|
||||
# blender backups
|
||||
*.blend1
|
||||
|
|
|
@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
</div>
|
||||
</template>
|
||||
<template #default="{items}">
|
||||
<div class="mk-follow-requests">
|
||||
<div class="mk-follow-requests _gaps">
|
||||
<div v-for="req in items" :key="req.id" class="user _panel">
|
||||
<MkAvatar class="avatar" :user="displayUser(req)" indicator link preview/>
|
||||
<div class="body">
|
||||
|
@ -94,11 +94,11 @@ const headerTabs = computed(() => [
|
|||
{
|
||||
key: 'list',
|
||||
title: i18n.ts._followRequest.recieved,
|
||||
icon: 'ti ti-mail',
|
||||
icon: 'ti ti-download',
|
||||
}, {
|
||||
key: 'sent',
|
||||
title: i18n.ts._followRequest.sent,
|
||||
icon: 'ti ti-send',
|
||||
icon: 'ti ti-upload',
|
||||
},
|
||||
]);
|
||||
|
||||
|
|
Loading…
Reference in a new issue