Change "thread" and "status--wrapper" to custom Tailwind

This commit is contained in:
danidfra 2024-11-06 02:27:19 -03:00
parent b92276553a
commit 80388d2cdc
10 changed files with 47 additions and 12 deletions

View File

@ -333,7 +333,7 @@ const Status: React.FC<IStatus> = (props) => {
return ( return (
<HotKeys handlers={minHandlers}> <HotKeys handlers={minHandlers}>
<div className={clsx('status__wrapper text-center', { focusable })} tabIndex={focusable ? 0 : undefined} ref={node}> <div className={clsx('status--wrapper text-center', { focusable })} tabIndex={focusable ? 0 : undefined} ref={node}>
{/* eslint-disable formatjs/no-literal-string-in-jsx */} {/* eslint-disable formatjs/no-literal-string-in-jsx */}
<Text theme='muted'> <Text theme='muted'>
<FormattedMessage id='status.filtered' defaultMessage='Filtered' />: {status.filtered.join(', ')}. <FormattedMessage id='status.filtered' defaultMessage='Filtered' />: {status.filtered.join(', ')}.
@ -412,7 +412,7 @@ const Status: React.FC<IStatus> = (props) => {
> >
<Card <Card
variant={variant} variant={variant}
className={clsx('status__wrapper space-y-4', `status-${actualStatus.visibility}`, { className={clsx('status--wrapper space-y-4', `status-${actualStatus.visibility}`, {
'py-6 sm:p-5': variant === 'rounded', 'py-6 sm:p-5': variant === 'rounded',
'status-reply': !!status.in_reply_to_id, 'status-reply': !!status.in_reply_to_id,
muted, muted,
@ -436,7 +436,7 @@ const Status: React.FC<IStatus> = (props) => {
avatarSize={avatarSize} avatarSize={avatarSize}
/> />
<div className='status__content-wrapper'> <div className='status--content-wrapper'>
<StatusReplyMentions status={actualStatus} hoverable={hoverable} /> <StatusReplyMentions status={actualStatus} hoverable={hoverable} />
<Stack <Stack

View File

@ -178,7 +178,7 @@ const EventDiscussion: React.FC<IEventDiscussion> = (props) => {
{me && <div className='border-b border-solid border-gray-200 p-2 pt-0 dark:border-gray-800'> {me && <div className='border-b border-solid border-gray-200 p-2 pt-0 dark:border-gray-800'>
<ComposeForm id={`reply:${status.id}`} autoFocus={false} event={status.id} /> <ComposeForm id={`reply:${status.id}`} autoFocus={false} event={status.id} />
</div>} </div>}
<div ref={node} className='thread p-0 shadow-none sm:p-2'> <div ref={node} className='thread p-0 shadow-none black:bg-black dark:bg-primary-900 sm:p-2'>
<ScrollableList <ScrollableList
id='thread' id='thread'
ref={scroller} ref={scroller}

View File

@ -33,7 +33,7 @@ const PlaceholderStatus: React.FC<IPlaceholderStatus> = ({ variant }) => (
</HStack> </HStack>
</div> </div>
<div className='status__content-wrapper mt-4'> <div className='status--content-wrapper mt-4'>
<PlaceholderStatusContent minLength={5} maxLength={120} /> <PlaceholderStatusContent minLength={5} maxLength={120} />
</div> </div>
</div> </div>

View File

@ -31,7 +31,7 @@ const ScheduledStatus: React.FC<IScheduledStatus> = ({ statusId, ...other }) =>
const account = status.account; const account = status.account;
return ( return (
<div className={clsx('status__wrapper', `status__wrapper-${status.visibility}`, { 'status__wrapper-reply': !!status.in_reply_to_id })} tabIndex={0}> <div className={clsx('status--wrapper', `status--wrapper-${status.visibility}`, { 'status--wrapper-reply': !!status.in_reply_to_id })} tabIndex={0}>
<div className={clsx('status', `status-${status.visibility}`, { 'status-reply': !!status.in_reply_to_id })} data-id={status.id}> <div className={clsx('status', `status-${status.visibility}`, { 'status-reply': !!status.in_reply_to_id })} data-id={status.id}>
<div className='mb-4'> <div className='mb-4'>
<HStack justifyContent='between' alignItems='start'> <HStack justifyContent='between' alignItems='start'>

View File

@ -78,7 +78,7 @@ const PendingStatus: React.FC<IPendingStatus> = ({ idempotencyKey, className, mu
</HStack> </HStack>
</div> </div>
<div className='status__content-wrapper'> <div className='status--content-wrapper'>
<StatusReplyMentions status={status} /> <StatusReplyMentions status={status} />
<Stack space={4}> <Stack space={4}>

View File

@ -4,12 +4,12 @@
&__status { &__status {
@apply relative pb-4; @apply relative pb-4;
.status__wrapper { .status--wrapper {
@apply shadow-none p-0; @apply shadow-none p-0;
} }
} }
.status__content-wrapper { .status--content-wrapper {
@apply pl-[calc(42px+12px)] rtl:pl-0 rtl:pr-[calc(42px+12px)]; @apply pl-[calc(42px+12px)] rtl:pl-0 rtl:pr-[calc(42px+12px)];
} }
} }

View File

@ -1,3 +1,3 @@
.notification .status__wrapper { .notification .status--wrapper {
@apply p-0 shadow-none rounded-none; @apply p-0 shadow-none rounded-none;
} }

View File

@ -7,7 +7,7 @@
} }
} }
.status__wrapper { .status--wrapper {
.reply-mentions { .reply-mentions {
display: block; display: block;

View File

@ -15,7 +15,7 @@
} }
} }
[column-type='filled'] .status__wrapper, [column-type='filled'] .status--wrapper,
[column-type='filled'] .status-placeholder { [column-type='filled'] .status-placeholder {
@apply bg-transparent dark:bg-transparent rounded-none shadow-none; @apply bg-transparent dark:bg-transparent rounded-none shadow-none;
} }

View File

@ -3,6 +3,41 @@
@tailwind utilities; @tailwind utilities;
@layer utilities { @layer utilities {
.thread {
@apply bg-white;
.status--content-wrapper {
@apply pl-[54px] rtl:pl-0 rtl:pr-[54px];
}
}
.thread__status {
@apply relative pb-4;
.status--wrapper {
@apply shadow-none p-0;
}
}
.notification .status--wrapper {
@apply p-0 shadow-none rounded-none;
}
.status--wrapper {
.reply-mentions {
display: block;
span {
cursor: pointer;
}
}
}
[column-type='filled'] .status--wrapper,
[column-type='filled'] .status-placeholder {
@apply bg-transparent dark:bg-transparent rounded-none shadow-none;
}
.search__icon { .search__icon {
&::-moz-focus-inner { &::-moz-focus-inner {
border: 0; border: 0;