diff --git a/commafeed-client/src/components/content/FeedEntry.tsx b/commafeed-client/src/components/content/FeedEntry.tsx index 006508b3..e3d488e0 100644 --- a/commafeed-client/src/components/content/FeedEntry.tsx +++ b/commafeed-client/src/components/content/FeedEntry.tsx @@ -187,7 +187,7 @@ export function FeedEntry(props: FeedEntryProps) { - + )} diff --git a/commafeed-client/src/components/content/FeedEntryFooter.tsx b/commafeed-client/src/components/content/FeedEntryFooter.tsx index ad11883b..e5bb7dfe 100644 --- a/commafeed-client/src/components/content/FeedEntryFooter.tsx +++ b/commafeed-client/src/components/content/FeedEntryFooter.tsx @@ -37,7 +37,7 @@ export function FeedEntryFooter(props: FeedEntryFooterProps) { ) return ( - + {props.entry.markable && ( - + + {props.showStarIcon && ( @@ -41,7 +41,7 @@ export function FeedEntryHeader(props: FeedEntryHeaderProps) { {props.showExternalLinkIcon && } - + @@ -51,7 +51,7 @@ export function FeedEntryHeader(props: FeedEntryHeaderProps) { {props.expanded && ( - + {props.entry.author && by {props.entry.author}} {props.entry.author && props.entry.categories &&  ยท } {props.entry.categories && {props.entry.categories}} diff --git a/commafeed-client/src/components/header/Header.tsx b/commafeed-client/src/components/header/Header.tsx index 0df73531..d6867f41 100644 --- a/commafeed-client/src/components/header/Header.tsx +++ b/commafeed-client/src/components/header/Header.tsx @@ -42,11 +42,14 @@ function HeaderToolbar(props: { children: React.ReactNode }) { display: "flex", justifyContent: "space-between", }} + className="cf-toolbar" > {props.children} ) : ( - {props.children} + + {props.children} + ) } @@ -75,7 +78,7 @@ export function Header() { if (!settings) return return ( -
+
} diff --git a/commafeed-client/src/components/sidebar/TreeNode.tsx b/commafeed-client/src/components/sidebar/TreeNode.tsx index f791de8b..17feac9b 100644 --- a/commafeed-client/src/components/sidebar/TreeNode.tsx +++ b/commafeed-client/src/components/sidebar/TreeNode.tsx @@ -68,18 +68,18 @@ export function TreeNode(props: TreeNodeProps) { props.onClick(e, props.id)} data-id={props.id} data-type={props.type} data-unread-count={props.unread} > - props.onIconClick?.(e, props.id)}> + props.onIconClick?.(e, props.id)} className="cf-treenode-icon">
{typeof props.icon === "string" ? : props.icon}
{props.name} {!props.expanded && ( - + )} diff --git a/commafeed-client/src/components/sidebar/UnreadCount.tsx b/commafeed-client/src/components/sidebar/UnreadCount.tsx index d808af51..63e39235 100644 --- a/commafeed-client/src/components/sidebar/UnreadCount.tsx +++ b/commafeed-client/src/components/sidebar/UnreadCount.tsx @@ -18,7 +18,7 @@ export function UnreadCount(props: { unreadCount: number }) { const count = props.unreadCount >= 10000 ? "10k+" : props.unreadCount return ( - + {count} diff --git a/commafeed-client/src/pages/app/Layout.tsx b/commafeed-client/src/pages/app/Layout.tsx index ef3c99a5..4e23ae72 100644 --- a/commafeed-client/src/pages/app/Layout.tsx +++ b/commafeed-client/src/pages/app/Layout.tsx @@ -35,9 +35,16 @@ interface LayoutProps { function LogoAndTitle() { const dispatch = useAppDispatch() return ( -
await dispatch(redirectToRootCategory())} style={{ cursor: "pointer" }}> - - + <Center + className="cf-logo-title" + inline + onClick={async () => await dispatch(redirectToRootCategory())} + style={{ cursor: "pointer" }} + > + <Box className="cf-logo"> + <Logo size={24} /> + </Box> + <Title order={3} pl="md" className="cf-title"> CommaFeed