diff --git a/src/renderer/src/components/entry-content/share.tsx b/src/renderer/src/components/entry-content/share.tsx index ea20e1e6e..71c061668 100644 --- a/src/renderer/src/components/entry-content/share.tsx +++ b/src/renderer/src/components/entry-content/share.tsx @@ -4,9 +4,9 @@ import { TooltipProvider, TooltipTrigger, } from "@renderer/components/ui/tooltip" -import { cn } from "@renderer/lib/utils" import { useEntryActions } from "@renderer/hooks/useEntryActions" import { ActivedEntry } from "@renderer/lib/types" +import { Button } from "@renderer/components/ui/button" export function EntryShare({ view, @@ -24,25 +24,25 @@ export function EntryShare({ }) return ( -
- +
+ {items .filter((item) => !item.disabled) .map((item) => ( - - {item.icon ? ( - execAction(item.action)} - /> - ) : ( - execAction(item.action)} - /> - )} + + {item.name} diff --git a/src/renderer/src/components/feed-column/index.tsx b/src/renderer/src/components/feed-column/index.tsx index bc2f66bc9..be952b9d8 100644 --- a/src/renderer/src/components/feed-column/index.tsx +++ b/src/renderer/src/components/feed-column/index.tsx @@ -14,6 +14,7 @@ import { ActivedList } from "@renderer/lib/types" import { UserButton } from "@renderer/components/user-button" import { levels, views } from "@renderer/lib/constants" import { Link } from "react-router-dom" +import { Button } from "@renderer/components/ui/button" const lethargy = new Lethargy() @@ -72,44 +73,52 @@ export function FeedColumn({ }) } > -
+
logo Follow
-
- - - - - - +
+ +
-
- +
+ {views.map((item, index) => ( -
{ - setActive(index) - setActivedList?.({ - level: "view", - id: index, - name: views[index].name, - view: index, - }) - e.stopPropagation() - }} - > - - + + +
+ + + {item.name} + ))}
diff --git a/src/renderer/src/components/ui/button.tsx b/src/renderer/src/components/ui/button.tsx index 231db2a32..176646cd3 100644 --- a/src/renderer/src/components/ui/button.tsx +++ b/src/renderer/src/components/ui/button.tsx @@ -16,12 +16,12 @@ const buttonVariants = cva( "border border-input bg-background hover:bg-accent hover:text-accent-foreground", secondary: "bg-secondary text-secondary-foreground hover:bg-secondary/80", - ghost: "hover:bg-accent hover:text-accent-foreground", + ghost: "hover:bg-zinc-500/10", link: "text-primary underline-offset-4 hover:underline", }, size: { default: "h-10 px-4 py-2", - sm: "h-9 rounded-md px-3", + sm: "h-8 rounded-md px-1.5", lg: "h-11 rounded-md px-8", xl: "h-14 rounded-lg px-10", icon: "h-10 w-10",