diff --git a/app/javascript/mastodon/features/collection_adder/index.tsx b/app/javascript/mastodon/features/collection_adder/index.tsx index 2045e55fb34..7fd8e09cc41 100644 --- a/app/javascript/mastodon/features/collection_adder/index.tsx +++ b/app/javascript/mastodon/features/collection_adder/index.tsx @@ -174,12 +174,17 @@ export const CollectionAdder: React.FC<{ /> } > - + ) : ( <>
- + + +
{collections.map((item) => ( diff --git a/app/javascript/mastodon/features/collection_adder/styles.module.scss b/app/javascript/mastodon/features/collection_adder/styles.module.scss index 99ecf1373ed..0a0ee300b8f 100644 --- a/app/javascript/mastodon/features/collection_adder/styles.module.scss +++ b/app/javascript/mastodon/features/collection_adder/styles.module.scss @@ -1,5 +1,3 @@ .newCollection { - display: flex; - justify-content: center; - padding-block: 16px; + padding: 16px; } diff --git a/app/javascript/mastodon/features/collections/overview/created_by_account.tsx b/app/javascript/mastodon/features/collections/overview/created_by_account.tsx index 33f5c559b3c..849c50d31ca 100644 --- a/app/javascript/mastodon/features/collections/overview/created_by_account.tsx +++ b/app/javascript/mastodon/features/collections/overview/created_by_account.tsx @@ -1,7 +1,9 @@ +import type { ReactNode } from 'react'; import { useEffect } from 'react'; import { FormattedMessage } from 'react-intl'; +import classNames from 'classnames'; import { Link } from 'react-router-dom'; import AddIcon from '@/material-icons/400-24px/add.svg?react'; @@ -26,16 +28,23 @@ import { } from '../editor'; import classes from '../styles.module.scss'; -export const NewCollectionButton: React.FC<{ onClick?: () => void }> = ({ - onClick, -}) => ( +export const NewCollectionButton: React.FC<{ + compact?: boolean; + secondary?: boolean; + onClick?: () => void; + children?: ReactNode; +}> = ({ compact, secondary, onClick, children }) => ( - + {children ?? } ); @@ -103,7 +112,7 @@ export const CollectionsCreatedByAccount: React.FC = () => { /> } > - + ); } else { @@ -135,7 +144,7 @@ export const CollectionsCreatedByAccount: React.FC = () => { }} /> - {showCreateButton && } + {showCreateButton && } {isOwnCollectionPage && !canCreateMoreCollections && ( diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 508b0540828..76a1e37ac4a 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -391,6 +391,7 @@ "collections.create.basic_details_title": "Basic details", "collections.create.steps": "Step {step}/{total}", "collections.create_collection": "Create collection", + "collections.create_new_collection": "Create new collection", "collections.delete_collection": "Delete collection", "collections.description_length_hint": "100 characters limit", "collections.detail.author_added_you_on_date": "{author} added you on {date}",