diff --git a/app/javascript/mastodon/features/ui/components/block_modal.jsx b/app/javascript/mastodon/features/ui/components/block_modal.jsx
index 21a984f97f..831cf3c3f0 100644
--- a/app/javascript/mastodon/features/ui/components/block_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/block_modal.jsx
@@ -10,12 +10,14 @@ import { useDispatch } from 'react-redux';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
import BlockIcon from '@/material-icons/400-24px/block.svg?react';
import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import CollectionsIcon from '@/material-icons/400-24px/category.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
import { blockAccount } from 'mastodon/actions/accounts';
import { closeModal } from 'mastodon/actions/modal';
import { Button } from 'mastodon/components/button';
import { Icon } from 'mastodon/components/icon';
+import { areCollectionsEnabled } from '../../collections/utils';
export const BlockModal = ({ accountId, acct }) => {
const dispatch = useDispatch();
@@ -46,31 +48,38 @@ export const BlockModal = ({ accountId, acct }) => {
-
+
+
+
+ {areCollectionsEnabled() &&
+
+
+
+
+ }
+
diff --git a/app/javascript/mastodon/features/ui/components/domain_block_modal.tsx b/app/javascript/mastodon/features/ui/components/domain_block_modal.tsx
index eb2ccbb035..21d0b03a53 100644
--- a/app/javascript/mastodon/features/ui/components/domain_block_modal.tsx
+++ b/app/javascript/mastodon/features/ui/components/domain_block_modal.tsx
@@ -83,15 +83,15 @@ export const DomainBlockModal: React.FC<{
defaultMessage='Block domain?'
/>
-
{domain}
+
{domain}
-
+
{preview &&
preview !== 'error' &&
preview.followers_count + preview.following_count > 0 && (
-
+
-
@@ -113,11 +113,11 @@ export const DomainBlockModal: React.FC<{
/>
-
+
)}
{preview === 'error' && (
-
+
@@ -129,10 +129,10 @@ export const DomainBlockModal: React.FC<{
/>
-
+
)}
-
+
@@ -142,9 +142,9 @@ export const DomainBlockModal: React.FC<{
defaultMessage="They won't know they've been blocked."
/>
-
+
-
+
@@ -154,9 +154,9 @@ export const DomainBlockModal: React.FC<{
defaultMessage="You won't see posts or notifications from users on this server."
/>
-
+
-
+
@@ -166,9 +166,9 @@ export const DomainBlockModal: React.FC<{
defaultMessage='Nobody from this server can follow you.'
/>
-
+
-
+
@@ -178,8 +178,8 @@ export const DomainBlockModal: React.FC<{
defaultMessage='People from this server can interact with your old posts.'
/>
-
-
+
+
diff --git a/app/javascript/mastodon/features/ui/components/ignore_notifications_modal.jsx b/app/javascript/mastodon/features/ui/components/ignore_notifications_modal.jsx
index dffaa04492..3ef771ed76 100644
--- a/app/javascript/mastodon/features/ui/components/ignore_notifications_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/ignore_notifications_modal.jsx
@@ -57,22 +57,22 @@ export const IgnoreNotificationsModal = ({ filterType }) => {
{title}
-
+
+
diff --git a/app/javascript/mastodon/features/ui/components/mute_modal.jsx b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
index 90b88030a0..3c9a5eeacf 100644
--- a/app/javascript/mastodon/features/ui/components/mute_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
@@ -85,31 +85,31 @@ export const MuteModal = ({ accountId, acct }) => {
-
+
+
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 95a6649871..b306d90bd3 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -328,14 +328,15 @@
"annual_report.summary.share_on_mastodon": "Share on Mastodon",
"attachments_list.unprocessed": "(unprocessed)",
"audio.hide": "Hide audio",
+ "block_modal.no_collections": "Neither of you can add each other to collections. You'll be automatically removed from each others' existing collections, if applicable.",
"block_modal.remote_users_caveat": "We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.",
"block_modal.show_less": "Show less",
"block_modal.show_more": "Show more",
- "block_modal.they_cant_mention": "They can't mention or follow you.",
- "block_modal.they_cant_see_posts": "They can't see your posts and you won't see theirs.",
+ "block_modal.they_cant_mention": "You can't mention, follow, or quote each other.",
+ "block_modal.they_cant_see_posts": "They can't see your content and you won't see theirs.",
"block_modal.they_will_know": "They can see that they're blocked.",
"block_modal.title": "Block user?",
- "block_modal.you_wont_see_mentions": "You won't see posts that mention them.",
+ "block_modal.you_wont_see_mentions": "You won't see posts from others that mention them.",
"boost_modal.combo": "You can press {combo} to skip this next time",
"boost_modal.reblog": "Boost post?",
"boost_modal.undo_reblog": "Unboost post?",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index e498ab2049..eb0869d04f 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -6489,14 +6489,16 @@ a.status-card {
&__bullet-points {
display: flex;
flex-direction: column;
- gap: 8px;
+ gap: 16px;
font-size: 16px;
line-height: 24px;
+ & > li,
& > div {
display: flex;
gap: 16px;
- align-items: center;
+ align-items: start;
+ text-wrap: pretty;
strong {
font-weight: 700;
@@ -6509,7 +6511,7 @@ a.status-card {
&__icon {
width: 40px;
- height: 40px;
+ height: 24px;
display: flex;
align-items: center;
justify-content: center;