From cddf70f0aba1bb35df56a27c38eb76c835f1eff3 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 22 Aug 2022 12:11:01 -0400 Subject: [PATCH] Fix status style regressions --- app/soapbox/components/status.tsx | 3 ++- app/soapbox/components/ui/card/card.tsx | 1 - app/soapbox/features/ads/components/ad.tsx | 2 +- app/soapbox/features/settings/index.tsx | 2 +- app/soapbox/features/status/index.tsx | 2 +- .../features/ui/components/pending_status.tsx | 12 ++++++++---- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx index 90f44d496..da7af3fa7 100644 --- a/app/soapbox/components/status.tsx +++ b/app/soapbox/components/status.tsx @@ -237,7 +237,7 @@ const Status: React.FC = (props) => { ); reblogElementMobile = ( -
+
event.stopPropagation()} @@ -325,6 +325,7 @@ const Status: React.FC = (props) => { (({ children, variant = 'def ref={ref} {...filteredProps} 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', [sizes[size]]: variant === 'rounded', }, className)} diff --git a/app/soapbox/features/ads/components/ad.tsx b/app/soapbox/features/ads/components/ad.tsx index 1556d56e5..7ab86c2c0 100644 --- a/app/soapbox/features/ads/components/ad.tsx +++ b/app/soapbox/features/ads/components/ad.tsx @@ -53,7 +53,7 @@ const Ad: React.FC = ({ card, impression }) => { return (
- + diff --git a/app/soapbox/features/settings/index.tsx b/app/soapbox/features/settings/index.tsx index d342fd8f8..b8a7a33ec 100644 --- a/app/soapbox/features/settings/index.tsx +++ b/app/soapbox/features/settings/index.tsx @@ -60,7 +60,7 @@ const Settings = () => { return ( - + diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx index add55ecf0..1f02961d8 100644 --- a/app/soapbox/features/status/index.tsx +++ b/app/soapbox/features/status/index.tsx @@ -380,9 +380,9 @@ const Thread: React.FC = (props) => { return ( ); }; diff --git a/app/soapbox/features/ui/components/pending_status.tsx b/app/soapbox/features/ui/components/pending_status.tsx index 70ab0ccfe..5f4e5c63c 100644 --- a/app/soapbox/features/ui/components/pending_status.tsx +++ b/app/soapbox/features/ui/components/pending_status.tsx @@ -3,7 +3,7 @@ import React from 'react'; import StatusReplyMentions from 'soapbox/components/status-reply-mentions'; 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 PlaceholderCard from 'soapbox/features/placeholder/components/placeholder_card'; import PlaceholderMediaGallery from 'soapbox/features/placeholder/components/placeholder_media_gallery'; @@ -24,6 +24,7 @@ interface IPendingStatus { className?: string, idempotencyKey: string, muted?: boolean, + thread?: boolean, } interface IPendingStatusMedia { @@ -44,7 +45,7 @@ const PendingStatusMedia: React.FC = ({ status }) => { } }; -const PendingStatus: React.FC = ({ idempotencyKey, className, muted }) => { +const PendingStatus: React.FC = ({ idempotencyKey, className, muted, thread = false }) => { const status = useAppSelector((state) => { const pendingStatus = state.pending_statuses.get(idempotencyKey); return pendingStatus ? buildStatus(state, pendingStatus, idempotencyKey) : null; @@ -58,7 +59,10 @@ const PendingStatus: React.FC = ({ idempotencyKey, className, mu return (
-
+
= ({ idempotencyKey, className, mu {/* TODO */} {/* */} -
+
);