diff --git a/src/renderer/src/assets/base.css b/src/renderer/src/assets/base.css index 75682a89fe..a58d7486a9 100644 --- a/src/renderer/src/assets/base.css +++ b/src/renderer/src/assets/base.css @@ -2,6 +2,7 @@ body, #root { @apply h-screen; @apply text-zinc-700; @apply cursor-default; + @apply select-none; font-family: 'SNPro', sans-serif; } diff --git a/src/renderer/src/components/feed-list.tsx b/src/renderer/src/components/feed-list.tsx index c52d589e61..f84d9aee61 100644 --- a/src/renderer/src/components/feed-list.tsx +++ b/src/renderer/src/components/feed-list.tsx @@ -1,10 +1,6 @@ import { useFeeds } from '@renderer/lib/feeds' -import { - Collapsible, - CollapsibleContent, - CollapsibleTrigger -} from '@renderer/components/ui/collapsible' -import { m, AnimatePresence, useSpring } from 'framer-motion' +import { Collapsible, CollapsibleTrigger } from '@renderer/components/ui/collapsible' +import { m, AnimatePresence } from 'framer-motion' import { useState } from 'react' export function FeedList({ type }: { type: string }) { @@ -20,7 +16,7 @@ export function FeedList({ type }: { type: string }) { console.log('categories', categories) return ( -
+
{type}
{Object.keys(categories).map((category) => ( @@ -37,9 +33,9 @@ function FeedCategory({ name, list }: { name: string; list: any[] }) { open={open} onOpenChange={(o) => setOpen(o)} > - + - {name} + {name} {open && ( @@ -73,7 +69,7 @@ function FeedCategory({ name, list }: { name: string; list: any[] }) { src={`https://icons.duckduckgo.com/ip3/${new URL(feed.site_url).host}.ico`} className="w-4 h-4 mr-2 rounded-sm" /> -
{feed.title}
+
{feed.title}
))} diff --git a/src/renderer/src/components/type-tab.tsx b/src/renderer/src/components/type-tab.tsx index 161b8ab1c7..1215e5a2c6 100644 --- a/src/renderer/src/components/type-tab.tsx +++ b/src/renderer/src/components/type-tab.tsx @@ -17,7 +17,7 @@ const items = [ { name: 'Articles', icon: , - className: 'text-indigo-600' + className: 'text-amber-700' }, { name: 'Social Media', @@ -56,7 +56,7 @@ export function TypeTab() { }) useEffect(() => { - spring.set(-active * 320) + spring.set(-active * 256) }, [active]) useWheel(({ event, last, memo: wait = false, direction: [dx], delta: [dex] }) => { @@ -81,11 +81,11 @@ export function TypeTab() { return ( -
+
{items.map((item, index) => (
{ setActive(index) }} diff --git a/src/renderer/src/components/ui/tooltip.tsx b/src/renderer/src/components/ui/tooltip.tsx index 11a53cdbfe..fcac3026ae 100644 --- a/src/renderer/src/components/ui/tooltip.tsx +++ b/src/renderer/src/components/ui/tooltip.tsx @@ -17,7 +17,7 @@ const TooltipContent = React.forwardRef< ref={ref} sideOffset={sideOffset} className={cn( - "z-50 overflow-hidden rounded-md border bg-popover px-3 py-1.5 text-sm text-popover-foreground shadow-md animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2", + "z-50 overflow-hidden rounded-md bg-stone-300 px-2 py-1 text-sm text-popover-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2", className )} {...props} diff --git a/src/renderer/src/pages/index.tsx b/src/renderer/src/pages/index.tsx index be7bdb788f..68c62b36d9 100644 --- a/src/renderer/src/pages/index.tsx +++ b/src/renderer/src/pages/index.tsx @@ -3,7 +3,7 @@ import { TypeTab } from '@renderer/components/type-tab' export function Component() { return (
-
+
Two