diff --git a/app/soapbox/components/ui/card/card.tsx b/app/soapbox/components/ui/card/card.tsx index c876219f4..f60ec2ac8 100644 --- a/app/soapbox/components/ui/card/card.tsx +++ b/app/soapbox/components/ui/card/card.tsx @@ -35,7 +35,7 @@ const Card = React.forwardRef(({ children, variant, size className={classNames({ 'space-y-4': true, 'bg-white dark:bg-slate-800 text-black dark:text-white shadow-lg dark:shadow-inset overflow-hidden': variant === 'rounded', - [sizes[size]]: true, + [sizes[size]]: variant === 'rounded', }, className)} > {children} diff --git a/app/soapbox/components/ui/column/column.tsx b/app/soapbox/components/ui/column/column.tsx index 81b7fca1e..e0e86a398 100644 --- a/app/soapbox/components/ui/column/column.tsx +++ b/app/soapbox/components/ui/column/column.tsx @@ -1,4 +1,3 @@ -import classNames from 'classnames'; import React from 'react'; import { useHistory } from 'react-router-dom'; @@ -42,25 +41,19 @@ const Column: React.FC = React.forwardRef((props, ref: React.ForwardedR } }; - const renderChildren = () => { - if (transparent) { - return
{children}
; - } + const renderChildren = () => ( + + {withHeader ? ( + + + + ) : null} - return ( - - {withHeader ? ( - - - - ) : null} - - - {children} - - - ); - }; + + {children} + + + ); return (
diff --git a/app/soapbox/features/bookmarks/index.tsx b/app/soapbox/features/bookmarks/index.tsx index 269aa8d1f..c645a56d1 100644 --- a/app/soapbox/features/bookmarks/index.tsx +++ b/app/soapbox/features/bookmarks/index.tsx @@ -36,7 +36,7 @@ const Bookmarks: React.FC = () => { const emptyMessage = ; return ( - +
diff --git a/app/soapbox/features/community_timeline/index.tsx b/app/soapbox/features/community_timeline/index.tsx index 60670a160..8c0adc2cb 100644 --- a/app/soapbox/features/community_timeline/index.tsx +++ b/app/soapbox/features/community_timeline/index.tsx @@ -43,7 +43,7 @@ const CommunityTimeline = () => { }, [onlyMedia]); return ( - + { }; return ( - + + + + { }, [isPartial]); return ( - + { ); return ( - + {/*