diff --git a/app/lish/[did]/[publication]/[rkey]/PostContent.tsx b/app/lish/[did]/[publication]/[rkey]/PostContent.tsx index 93ff8f34..a19a5458 100644 --- a/app/lish/[did]/[publication]/[rkey]/PostContent.tsx +++ b/app/lish/[did]/[publication]/[rkey]/PostContent.tsx @@ -123,12 +123,11 @@ let Block = ({ if (!alignment && PubLeafletBlocksImage.isMain(b.block)) alignment = "text-center justify-center"; - // non text blocks, they need this padding, pt-3 sm:pt-4, which is applied in each case let className = ` postBlockWrapper min-h-7 - pt-1 pb-2 - ${isList && "isListItem pb-0! "} + mt-1 mb-2 + ${isList && "isListItem mb-0! "} ${alignment} `; @@ -144,6 +143,7 @@ let Block = ({ parentPageId={pageId} did={did} bskyPostData={bskyPostData} + className={className} /> ); } @@ -151,7 +151,7 @@ let Block = ({ let uri = b.block.postRef.uri; let post = bskyPostData.find((p) => p.uri === uri); if (!post) return
no prefetched post rip
; - return ; + return ; } case PubLeafletBlocksIframe.isMain(b.block): { return ( @@ -200,7 +200,7 @@ let Block = ({ href={b.block.src} target="_blank" className={` - my-2 + ${className} externalLinkBlock flex relative group/linkBlock h-[104px] w-full bg-bg-page overflow-hidden text-primary hover:no-underline no-underline hover:border-accent-contrast shadow-sm @@ -252,7 +252,7 @@ let Block = ({ alt={b.block.alt} height={b.block.aspectRatio?.height} width={b.block.aspectRatio?.width} - className={`pt-3! sm:pt-4! rounded-md ${className}`} + className={`rounded-lg border border-transparent ${className}`} src={blobRefToSrc(b.block.image.ref, did)} /> {b.block.alt && ( @@ -273,7 +273,7 @@ let Block = ({ } case PubLeafletBlocksBlockquote.isMain(b.block): { return ( - // highly unfortunate hack so that the border-l on blockquote is the height of just the text rather than the height of the block, which includes padding. + // all this margin stuff is a highly unfortunate hack so that the border-l on blockquote is the height of just the text rather than the height of the block, which includes padding.
) : null; - return (

  • -
    +
    {identity && identity.atp_did === document.documents_in_publications[0]?.publications diff --git a/app/lish/[did]/[publication]/[rkey]/PublishBskyPostBlock.tsx b/app/lish/[did]/[publication]/[rkey]/PublishBskyPostBlock.tsx index bb44240c..807e902d 100644 --- a/app/lish/[did]/[publication]/[rkey]/PublishBskyPostBlock.tsx +++ b/app/lish/[did]/[publication]/[rkey]/PublishBskyPostBlock.tsx @@ -16,7 +16,11 @@ import { } from "components/Blocks/BlueskyPostBlock/BlueskyEmbed"; import { BlueskyRichText } from "components/Blocks/BlueskyPostBlock/BlueskyRichText"; -export const PubBlueskyPostBlock = ({ post }: { post: PostView }) => { +export const PubBlueskyPostBlock = (props: { + post: PostView; + className: string; +}) => { + let post = props.post; switch (true) { case AppBskyFeedDefs.isBlockedPost(post) || AppBskyFeedDefs.isBlockedAuthor(post) || @@ -46,6 +50,7 @@ export const PubBlueskyPostBlock = ({ post }: { post: PostView }) => { return (
    { if (e.isDefaultPrevented()) return; diff --git a/components/DesktopFooter.tsx b/components/DesktopFooter.tsx index 21c02bb9..3675dd3a 100644 --- a/components/DesktopFooter.tsx +++ b/components/DesktopFooter.tsx @@ -16,7 +16,7 @@ export function DesktopPageFooter(props: { pageID: string }) { return ( {focusedEntity && focusedEntity.entityType === "block" && diff --git a/components/Pages/Page.tsx b/components/Pages/Page.tsx index 2ec2016f..f0ae923d 100644 --- a/components/Pages/Page.tsx +++ b/components/Pages/Page.tsx @@ -133,6 +133,7 @@ export const PageWrapper = (props: { `} > {props.children} +
    {props.pageOptions}