Fix status style regressions

This commit is contained in:
Alex Gleason 2022-08-22 12:11:01 -04:00
parent 6e5689e3a3
commit cddf70f0ab
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
6 changed files with 13 additions and 9 deletions

View file

@ -237,7 +237,7 @@ const Status: React.FC<IStatus> = (props) => {
); );
reblogElementMobile = ( reblogElementMobile = (
<div className='sm:hidden truncate'> <div className='pb-5 -mt-2 sm:hidden truncate'>
<NavLink <NavLink
to={`/@${status.getIn(['account', 'acct'])}`} to={`/@${status.getIn(['account', 'acct'])}`}
onClick={(event) => event.stopPropagation()} onClick={(event) => event.stopPropagation()}
@ -325,6 +325,7 @@ const Status: React.FC<IStatus> = (props) => {
<Card <Card
variant={variant} variant={variant}
className={classNames('status__wrapper', `status-${actualStatus.visibility}`, { className={classNames('status__wrapper', `status-${actualStatus.visibility}`, {
'py-6 sm:p-5': variant === 'rounded',
'status-reply': !!status.in_reply_to_id, 'status-reply': !!status.in_reply_to_id,
muted, muted,
read: unread === false, read: unread === false,

View file

@ -33,7 +33,6 @@ const Card = React.forwardRef<HTMLDivElement, ICard>(({ children, variant = 'def
ref={ref} ref={ref}
{...filteredProps} {...filteredProps}
className={classNames({ className={classNames({
'space-y-4': true,
'bg-white dark:bg-primary-900 text-gray-900 dark:text-gray-100 shadow-lg dark:shadow-none overflow-hidden': variant === 'rounded', 'bg-white dark:bg-primary-900 text-gray-900 dark:text-gray-100 shadow-lg dark:shadow-none overflow-hidden': variant === 'rounded',
[sizes[size]]: variant === 'rounded', [sizes[size]]: variant === 'rounded',
}, className)} }, className)}

View file

@ -53,7 +53,7 @@ const Ad: React.FC<IAd> = ({ card, impression }) => {
return ( return (
<div className='relative'> <div className='relative'>
<Card className='p-5' variant='rounded'> <Card className='py-6 sm:p-5' variant='rounded'>
<Stack space={4}> <Stack space={4}>
<HStack alignItems='center' space={3}> <HStack alignItems='center' space={3}>
<Avatar src={instance.thumbnail} size={42} /> <Avatar src={instance.thumbnail} size={42} />

View file

@ -60,7 +60,7 @@ const Settings = () => {
return ( return (
<Column label={intl.formatMessage(messages.settings)} transparent withHeader={false}> <Column label={intl.formatMessage(messages.settings)} transparent withHeader={false}>
<Card variant='rounded'> <Card className='space-y-4' variant='rounded'>
<CardHeader> <CardHeader>
<CardTitle title={intl.formatMessage(messages.profile)} /> <CardTitle title={intl.formatMessage(messages.profile)} />
</CardHeader> </CardHeader>

View file

@ -380,9 +380,9 @@ const Thread: React.FC<IThread> = (props) => {
return ( return (
<PendingStatus <PendingStatus
className='thread__status'
key={id} key={id}
idempotencyKey={idempotencyKey} idempotencyKey={idempotencyKey}
thread
/> />
); );
}; };

View file

@ -3,7 +3,7 @@ import React from 'react';
import StatusReplyMentions from 'soapbox/components/status-reply-mentions'; import StatusReplyMentions from 'soapbox/components/status-reply-mentions';
import StatusContent from 'soapbox/components/status_content'; import StatusContent from 'soapbox/components/status_content';
import { HStack } from 'soapbox/components/ui'; import { Card, HStack } from 'soapbox/components/ui';
import AccountContainer from 'soapbox/containers/account_container'; import AccountContainer from 'soapbox/containers/account_container';
import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder_card'; import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder_card';
import PlaceholderMediaGallery from 'soapbox/features/placeholder/components/placeholder_media_gallery'; import PlaceholderMediaGallery from 'soapbox/features/placeholder/components/placeholder_media_gallery';
@ -24,6 +24,7 @@ interface IPendingStatus {
className?: string, className?: string,
idempotencyKey: string, idempotencyKey: string,
muted?: boolean, muted?: boolean,
thread?: boolean,
} }
interface IPendingStatusMedia { interface IPendingStatusMedia {
@ -44,7 +45,7 @@ const PendingStatusMedia: React.FC<IPendingStatusMedia> = ({ status }) => {
} }
}; };
const PendingStatus: React.FC<IPendingStatus> = ({ idempotencyKey, className, muted }) => { const PendingStatus: React.FC<IPendingStatus> = ({ idempotencyKey, className, muted, thread = false }) => {
const status = useAppSelector((state) => { const status = useAppSelector((state) => {
const pendingStatus = state.pending_statuses.get(idempotencyKey); const pendingStatus = state.pending_statuses.get(idempotencyKey);
return pendingStatus ? buildStatus(state, pendingStatus, idempotencyKey) : null; return pendingStatus ? buildStatus(state, pendingStatus, idempotencyKey) : null;
@ -58,7 +59,10 @@ const PendingStatus: React.FC<IPendingStatus> = ({ idempotencyKey, className, mu
return ( return (
<div className={classNames('opacity-50', className)}> <div className={classNames('opacity-50', className)}>
<div className={classNames('status', { 'status-reply': !!status.in_reply_to_id, muted })} data-id={status.id}> <div className={classNames('status', { 'status-reply': !!status.in_reply_to_id, muted })} data-id={status.id}>
<div className={classNames('status__wrapper', `status-${status.visibility}`, { 'status-reply': !!status.in_reply_to_id })} tabIndex={muted ? undefined : 0}> <Card
className={classNames('py-6 sm:p-5', `status-${status.visibility}`, { 'status-reply': !!status.in_reply_to_id })}
variant={thread ? 'default' : 'rounded'}
>
<div className='mb-4'> <div className='mb-4'>
<HStack justifyContent='between' alignItems='start'> <HStack justifyContent='between' alignItems='start'>
<AccountContainer <AccountContainer
@ -88,7 +92,7 @@ const PendingStatus: React.FC<IPendingStatus> = ({ idempotencyKey, className, mu
{/* TODO */} {/* TODO */}
{/* <PlaceholderActionBar /> */} {/* <PlaceholderActionBar /> */}
</div> </Card>
</div> </div>
</div> </div>
); );