diff --git a/locales/index.d.ts b/locales/index.d.ts index 3d23c7bd5c29..4308570f0746 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -694,6 +694,14 @@ export interface Locale extends ILocale { * リノートのミュートを解除 */ "renoteUnmute": string; + /** + * リアクションのミュート + */ + "mutedReactions": string; + /** + * リモートの絵文字をミュート + */ + "remoteCustomEmojiMuted": string; /** * ブロック */ diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 97d7e4a8640f..07a504e79634 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -169,6 +169,8 @@ mute: "ミュート" unmute: "ミュート解除" renoteMute: "リノートをミュート" renoteUnmute: "リノートのミュートを解除" +mutedReactions: "リアクションのミュート" +remoteCustomEmojiMuted: "リモートの絵文字をミュート" block: "ブロック" unblock: "ブロック解除" suspend: "凍結" diff --git a/packages/frontend/src/components/MkEmojiPickerDialog.vue b/packages/frontend/src/components/MkEmojiPickerDialog.vue index 1b1a496234a5..5e2ce9caa10a 100644 --- a/packages/frontend/src/components/MkEmojiPickerDialog.vue +++ b/packages/frontend/src/components/MkEmojiPickerDialog.vue @@ -1,5 +1,6 @@ @@ -104,6 +112,7 @@ watch([() => props.note.reactions, () => props.maxNumber], ([newSource, maxNumbe flex-wrap: wrap; align-items: center; margin: 4px -2px 0 -2px; + max-width: 100%; &:empty { display: none; diff --git a/packages/frontend/src/pages/settings/mute-block.vue b/packages/frontend/src/pages/settings/mute-block.vue index cd230567f067..7a17fbc6064f 100644 --- a/packages/frontend/src/pages/settings/mute-block.vue +++ b/packages/frontend/src/pages/settings/mute-block.vue @@ -20,6 +20,23 @@ SPDX-License-Identifier: AGPL-3.0-only + + + +
+
+ + +
+
+
+ + @@ -132,7 +149,7 @@ SPDX-License-Identifier: AGPL-3.0-only