xiaoxue_admin
/
Folo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: timeline margin and picture view content top marigin, closes #1106 

Signed-off-by: Innei <i@innei.in>
This commit is contained in:
Innei 2024-10-24 15:33:36 +08:00
parent 3a85febb6e
commit cf08c75275
No known key found for this signature in database
GPG Key ID: 0F62D33977F021F7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/renderer/src/modules/entry-column/Items/picture-masonry.tsx
View File

@ -230,7 +230,7 @@ export const PictureMasonry: FC<MasonryProps> = (props) => {
}, [scrollElement, renderMarkRead, scrollMarkRead, dataRef])
return (
<div ref={containerRef} className="p-4">
<div ref={containerRef} className="px-4 pt-2">
{isInitDim && isInitLayout && (
<MasonryItemWidthContext.Provider value={currentItemWidth}>
<MasonryItemsAspectRatioContext.Provider value={masonryItemsRadio}>

6
apps/renderer/src/modules/entry-column/index.tsx
View File

@ -5,7 +5,7 @@ import { ScrollArea } from "@follow/components/ui/scroll-area/index.js"
import { FeedViewType, views } from "@follow/constants"
import { useTitle, useTypeScriptHappyCallback } from "@follow/hooks"
import type { FeedModel } from "@follow/models/types"
import { cn, isBizId } from "@follow/utils/utils"
import { clsx, cn, isBizId } from "@follow/utils/utils"
import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react"
import { useTranslation } from "react-i18next"
import type {
@ -130,7 +130,7 @@ function EntryColumnImpl() {
/>
)
}
}, [isFetchingNextPage, view, unreadOnly, isArchived, entries]),
}, [isFetchingNextPage, showArchivedButton, t, view, entries.data?.pages]),
ScrollSeekPlaceholder: useCallback(() => <EntryItemSkeleton view={view} count={1} />, [view]),
},
scrollSeekConfiguration,
@ -209,7 +209,7 @@ function EntryColumnImpl() {
scrollbarClassName={cn("mt-3", !views[view].wideMode ? "w-[5px] p-0" : "")}
mask={false}
ref={scrollRef}
rootClassName="h-full"
rootClassName={clsx("h-full", views[view].wideMode ? "mt-2" : "")}
viewportClassName="[&>div]:grow flex"
>
{virtuosoOptions.totalCount === 0 && !showArchivedButton ? (

4
apps/renderer/src/modules/entry-column/layouts/TimelineTabs.tsx
View File

@ -29,7 +29,7 @@ export const TimelineTabs = () => {
return (
<Tabs
className="-ml-3 -mr-4 mt-1 flex overflow-x-auto scrollbar-none"
className="-ml-3 -mr-4 mt-3 flex overflow-x-auto scrollbar-none"
value={timeline}
onValueChange={(val) => {
if (!val) {
@ -41,7 +41,7 @@ export const TimelineTabs = () => {
}
}}
>
<TabsList className="h-10 justify-start overflow-hidden border-b-0" onWheel={handleWheel}>
<TabsList className="justify-start overflow-hidden border-b-0" onWheel={handleWheel}>
<TabsTrigger variant={"rounded"} className="p-0" value="">
Yours
</TabsTrigger>