leaflet.pub
a tool for shared writing and social publishing
Merge branch 'main' into feature/atp-canvas-blocks
awarm.space
+17
-12
+1
-1
app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
+1
-1
app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
+7
-8
app/lish/[did]/[publication]/[rkey]/PostContent.tsx
+7
-8
app/lish/[did]/[publication]/[rkey]/PostContent.tsx
···
124
124
if (!alignment && PubLeafletBlocksImage.isMain(b.block))
125
125
alignment = "text-center justify-center";
126
126
127
-
// non text blocks, they need this padding, pt-3 sm:pt-4, which is applied in each case
128
127
let className = `
129
128
postBlockWrapper
130
129
min-h-7
131
-
pt-1 pb-2
132
-
${isList && "isListItem pb-0! "}
130
+
mt-1 mb-2
131
+
${isList && "isListItem mb-0! "}
133
132
${alignment}
134
133
`;
135
134
···
150
149
bskyPostData={bskyPostData}
151
150
isCanvas={isCanvas}
152
151
pages={pages}
152
+
className={className}
153
153
/>
154
154
);
155
155
}
···
157
157
let uri = b.block.postRef.uri;
158
158
let post = bskyPostData.find((p) => p.uri === uri);
159
159
if (!post) return <div>no prefetched post rip</div>;
160
-
return <PubBlueskyPostBlock post={post} />;
160
+
return <PubBlueskyPostBlock post={post} className={className} />;
161
161
}
162
162
case PubLeafletBlocksIframe.isMain(b.block): {
163
163
return (
···
206
206
href={b.block.src}
207
207
target="_blank"
208
208
className={`
209
-
my-2
209
+
${className}
210
210
externalLinkBlock flex relative group/linkBlock
211
211
h-[104px] w-full bg-bg-page overflow-hidden text-primary hover:no-underline no-underline
212
212
hover:border-accent-contrast shadow-sm
···
258
258
alt={b.block.alt}
259
259
height={b.block.aspectRatio?.height}
260
260
width={b.block.aspectRatio?.width}
261
-
className={`pt-3! sm:pt-4! rounded-md ${className}`}
261
+
className={`rounded-lg border border-transparent ${className}`}
262
262
src={blobRefToSrc(b.block.image.ref, did)}
263
263
/>
264
264
{b.block.alt && (
···
279
279
}
280
280
case PubLeafletBlocksBlockquote.isMain(b.block): {
281
281
return (
282
-
// 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.
282
+
// 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.
283
283
<blockquote
284
284
className={` blockquote py-0! mb-2! last:mb-3! sm:last:mb-4! first:mt-2! sm:first:pt-3 ${className} ${PubLeafletBlocksBlockquote.isMain(previousBlock?.block) ? "-mt-2!" : "mt-1!"}`}
285
285
{...blockProps}
···
383
383
))}
384
384
</ul>
385
385
) : null;
386
-
387
386
return (
388
387
<li className={`pb-0! flex flex-row gap-2`}>
389
388
<div
+6
-1
app/lish/[did]/[publication]/[rkey]/PublishBskyPostBlock.tsx
+6
-1
app/lish/[did]/[publication]/[rkey]/PublishBskyPostBlock.tsx
···
16
16
} from "components/Blocks/BlueskyPostBlock/BlueskyEmbed";
17
17
import { BlueskyRichText } from "components/Blocks/BlueskyPostBlock/BlueskyRichText";
18
18
19
-
export const PubBlueskyPostBlock = ({ post }: { post: PostView }) => {
19
+
export const PubBlueskyPostBlock = (props: {
20
+
post: PostView;
21
+
className: string;
22
+
}) => {
23
+
let post = props.post;
20
24
switch (true) {
21
25
case AppBskyFeedDefs.isBlockedPost(post) ||
22
26
AppBskyFeedDefs.isBlockedAuthor(post) ||
···
46
50
return (
47
51
<div
48
52
className={`
53
+
${props.className}
49
54
block-border
50
55
mb-2
51
56
flex flex-col gap-2 relative w-full overflow-hidden group/blueskyPostBlock sm:p-3 p-2 text-sm text-secondary bg-bg-page
+1
-1
app/lish/[did]/[publication]/[rkey]/PublishedPageBlock.tsx
+1
-1
app/lish/[did]/[publication]/[rkey]/PublishedPageBlock.tsx