diff --git a/CHANGELOG.md b/CHANGELOG.md index 923e8680f8..f6cbcb9af6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ You should also include the user name that made the change. - ユーザーごとにRenoteをミュートできるように - ノートごとに絵文字リアクションを受け取るか設定できるように - enhance(client): DM作成時にメンションも含むように +- enhance(client): フォロー申請のボタンのデザインを改善 ### Bugfixes - diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue index 38bf416ea8..b60967de02 100644 --- a/packages/frontend/src/components/MkNotification.vue +++ b/packages/frontend/src/components/MkNotification.vue @@ -69,8 +69,9 @@ {{ i18n.ts.followRequestAccepted }} @@ -87,6 +88,7 @@ import * as misskey from 'misskey-js'; import MkReactionIcon from '@/components/MkReactionIcon.vue'; import MkFollowButton from '@/components/MkFollowButton.vue'; import XReactionTooltip from '@/components/MkReactionTooltip.vue'; +import MkButton from '@/components/MkButton.vue'; import { getNoteSummary } from '@/scripts/get-note-summary'; import { notePage } from '@/filters/note'; import { userPage } from '@/filters/user'; @@ -294,6 +296,16 @@ useTooltip(reactionRef, (showing) => { margin-left: 4px; } +.followRequestCommands { + display: flex; + gap: 8px; + max-width: 300px; + margin-top: 8px; +} +.followRequestCommandButton { + flex: 1; +} + @container (max-width: 600px) { .root { padding: 16px; diff --git a/packages/frontend/src/pages/follow-requests.vue b/packages/frontend/src/pages/follow-requests.vue index 835dd0b54c..a51d1c78a4 100644 --- a/packages/frontend/src/pages/follow-requests.vue +++ b/packages/frontend/src/pages/follow-requests.vue @@ -18,12 +18,9 @@

@{{ acct(req.follower) }}

-
- -
-
- - +
+ {{ i18n.ts.accept }} + {{ i18n.ts.reject }}
@@ -37,6 +34,7 @@