From 375000b10f8d9e129130c8b8ec77fef8d804ea88 Mon Sep 17 00:00:00 2001 From: Innei Date: Tue, 11 Nov 2025 00:33:29 +0800 Subject: [PATCH] fix(style): rounded style based on article item container Signed-off-by: Innei --- .../src/modules/entry-column/components/DateItem.tsx | 5 +++-- .../modules/entry-column/components/mark-all-button.tsx | 7 ++++++- .../src/modules/entry-column/layouts/EntryItemWrapper.tsx | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/desktop/layer/renderer/src/modules/entry-column/components/DateItem.tsx b/apps/desktop/layer/renderer/src/modules/entry-column/components/DateItem.tsx index 6193534e5..1b0aa458d 100644 --- a/apps/desktop/layer/renderer/src/modules/entry-column/components/DateItem.tsx +++ b/apps/desktop/layer/renderer/src/modules/entry-column/components/DateItem.tsx @@ -2,7 +2,7 @@ import { ActionButton } from "@follow/components/ui/button/index.js" import { FeedViewType } from "@follow/constants" import { useIsListSubscription } from "@follow/store/subscription/hooks" import { stopPropagation } from "@follow/utils/dom" -import { cn } from "@follow/utils/utils" +import { clsx, cn } from "@follow/utils/utils" import type { FC, PropsWithChildren } from "react" import { memo, useMemo, useRef, useState } from "react" import { Trans } from "react-i18next" @@ -15,6 +15,7 @@ import { getRouteParams, useRouteParams } from "~/hooks/biz/useRouteParams" import { useShowEntryDetailsColumn } from "~/hooks/biz/useShowEntryDetailsColumn" import { markAllByRoute } from "../hooks/useMarkAll" +import { readableContentMaxWidth } from "../styles" interface DateItemInnerProps { date: Date @@ -54,7 +55,7 @@ const UniversalDateItem = ({ date, className, isSticky }: Omit { markAllByRoute(getRouteParams(), filter) .then(() => setStatus("done")) diff --git a/apps/desktop/layer/renderer/src/modules/entry-column/layouts/EntryItemWrapper.tsx b/apps/desktop/layer/renderer/src/modules/entry-column/layouts/EntryItemWrapper.tsx index 79dd0bc83..37a7ce529 100644 --- a/apps/desktop/layer/renderer/src/modules/entry-column/layouts/EntryItemWrapper.tsx +++ b/apps/desktop/layer/renderer/src/modules/entry-column/layouts/EntryItemWrapper.tsx @@ -153,7 +153,7 @@ export const EntryItemWrapper: FC< to={navigationPath} className={cn( "relative block cursor-button overflow-visible duration-200 hover:bg-theme-item-hover", - isWide ? "rounded-none @[650px]:rounded-md" : "", + !isWide ? "rounded-none @[650px]:rounded-md" : "rounded-md", isAll && "!rounded-none", (isActive || isContextMenuOpen) && "!bg-theme-item-active", itemClassName,