mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-07-09 07:34:55 +02:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f87981eeee | ||
|
|
761ae807db | ||
|
|
5e967e24ff | ||
|
|
70ac07d60e |
@@ -331,7 +331,7 @@ desktop/views/components/drive.vue:
|
||||
url-upload: "URLからアップロード"
|
||||
|
||||
desktop/views/components/follow-button.vue:
|
||||
unfollow: "フォロー中"
|
||||
following: "フォロー中"
|
||||
follow: "フォロー"
|
||||
request-pending: "フォロー許可待ち"
|
||||
follow-request: "フォロー申請"
|
||||
@@ -780,7 +780,7 @@ mobile/views/components/drive.file-detail.vue:
|
||||
exif: "EXIF"
|
||||
|
||||
mobile/views/components/follow-button.vue:
|
||||
unfollow: "フォロー中"
|
||||
following: "フォロー中"
|
||||
follow: "フォロー"
|
||||
request-pending: "フォロー許可待ち"
|
||||
follow-request: "フォロー申請"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"name": "misskey",
|
||||
"author": "syuilo <i@syuilo.com>",
|
||||
"version": "2.25.1",
|
||||
"clientVersion": "1.0.6112",
|
||||
"version": "2.25.2",
|
||||
"clientVersion": "1.0.6116",
|
||||
"codename": "nighthike",
|
||||
"main": "./built/index.js",
|
||||
"private": true,
|
||||
|
||||
BIN
src/client/app/auth/assets/icon.svg
Normal file
BIN
src/client/app/auth/assets/icon.svg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 646 B |
@@ -27,7 +27,7 @@
|
||||
<h1>サインインしてください</h1>
|
||||
<mk-signin/>
|
||||
</main>
|
||||
<footer><img src="/assets/auth/logo.svg" alt="Misskey"/></footer>
|
||||
<footer><img src="/assets/auth/icon.svg" alt="Misskey"/></footer>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -144,8 +144,8 @@ export default Vue.extend({
|
||||
> footer
|
||||
> img
|
||||
display block
|
||||
width 64px
|
||||
height 64px
|
||||
margin 0 auto
|
||||
width 32px
|
||||
height 32px
|
||||
margin 16px auto
|
||||
|
||||
</style>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
>
|
||||
<template v-if="!wait">
|
||||
<template v-if="u.hasPendingFollowRequestFromYou">%fa:hourglass-half%<template v-if="size == 'big'"> %i18n:@request-pending%</template></template>
|
||||
<template v-else-if="u.isFollowing">%fa:minus%<template v-if="size == 'big'"> %i18n:@unfollow%</template></template>
|
||||
<template v-else-if="u.isFollowing">%fa:minus%<template v-if="size == 'big'"> %i18n:@following%</template></template>
|
||||
<template v-else-if="!u.isFollowing && u.isLocked">%fa:plus%<template v-if="size == 'big'"> %i18n:@follow-request%</template></template>
|
||||
<template v-else-if="!u.isFollowing && !u.isLocked">%fa:plus%<template v-if="size == 'big'"> %i18n:@follow%</template></template>
|
||||
</template>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
>
|
||||
<template v-if="!wait">
|
||||
<template v-if="u.hasPendingFollowRequestFromYou">%fa:hourglass-half% %i18n:@request-pending%</template>
|
||||
<template v-else-if="u.isFollowing">%fa:minus% %i18n:@unfollow%</template>
|
||||
<template v-else-if="u.isFollowing">%fa:minus% %i18n:@following%</template>
|
||||
<template v-else-if="!u.isFollowing && u.isLocked">%fa:plus% %i18n:@follow-request%</template>
|
||||
<template v-else-if="!u.isFollowing && !u.isLocked">%fa:plus% %i18n:@follow%</template>
|
||||
</template>
|
||||
@@ -102,6 +102,7 @@ export default Vue.extend({
|
||||
min-width 150px
|
||||
line-height 36px
|
||||
font-size 14px
|
||||
font-weight bold
|
||||
color $theme-color
|
||||
background transparent
|
||||
outline none
|
||||
|
||||
@@ -49,5 +49,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
|
||||
create(follower, followee);
|
||||
|
||||
// Send response
|
||||
res(await pack(followee, user));
|
||||
res(await pack(followee._id, user));
|
||||
});
|
||||
|
||||
@@ -49,5 +49,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
|
||||
deleteFollowing(follower, followee);
|
||||
|
||||
// Send response
|
||||
res(await pack(followee, user));
|
||||
res(await pack(followee._id, user));
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user