1
0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-07-09 07:34:55 +02:00

Compare commits

..

4 Commits

Author SHA1 Message Date
syuilo
f87981eeee 2.25.2 2018-06-04 19:59:07 +09:00
syuilo
761ae807db Fix bug 2018-06-03 19:53:57 +09:00
syuilo
5e967e24ff ✌️ 2018-06-03 19:39:02 +09:00
syuilo
70ac07d60e 🎨 2018-06-03 07:34:34 +09:00
9 changed files with 13 additions and 12 deletions

View File

@@ -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: "フォロー申請"

View File

@@ -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,

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 646 B

View File

@@ -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>

View File

@@ -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>

View File

@@ -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

View File

@@ -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));
});

View File

@@ -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));
});