starred/linsa-linsa-io
1
0
Fork 0
mirror of https://github.com/linsa-io/linsa.git synced 2026-03-22 00:59:19 +01:00
Code Issues 2 Packages Projects Releases Wiki Activity

fix: conflict

Browse Source
This commit is contained in:
Aslam H
2024-09-28 00:54:08 +07:00
parent 8d23963b6e 223a4524ab
commit 4a365bdfe5
13 changed files with 286 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/components/custom/sidebar/partial/link-section.tsx
View File

@@ -47,7 +47,7 @@ const LinkSectionHeader: React.FC<LinkSectionHeaderProps> = ({ linkCount }) => {
return (
<div
className={cn(
"flex min-h-[30px] items-center gap-px rounded-md",
"flex h-9 items-center gap-px rounded-md sm:h-[30px]",
isLinksActive ? "bg-accent text-accent-foreground" : "hover:bg-accent hover:text-accent-foreground"
)}
>
@@ -55,7 +55,7 @@ const LinkSectionHeader: React.FC<LinkSectionHeaderProps> = ({ linkCount }) => {
href="/links"
className="flex flex-1 items-center justify-start rounded-md px-2 py-1 focus-visible:outline-none focus-visible:ring-0"
>
<p className="flex w-full items-center text-xs font-medium">
<p className="flex w-full items-center text-sm font-medium sm:text-xs">
Links
{linkCount > 0 && <span className="text-muted-foreground ml-1">{linkCount}</span>}
</p>
@@ -112,7 +112,7 @@ const ListItem: React.FC<ListItemProps> = ({ label, href, count, isActive }) =>
<Link
href={href}
className={cn(
"relative flex h-8 w-full items-center gap-2 rounded-md p-1.5 font-medium",
"relative flex h-9 w-full items-center gap-2 rounded-md p-1.5 font-medium sm:h-8",
isActive ? "bg-accent text-accent-foreground" : "hover:bg-accent hover:text-accent-foreground"
)}
>

6
web/components/custom/sidebar/partial/page-section.tsx
View File

@@ -77,12 +77,12 @@ interface PageSectionHeaderProps {
const PageSectionHeader: React.FC<PageSectionHeaderProps> = ({ pageCount, isActive }) => (
<div
className={cn(
"flex min-h-[30px] items-center gap-px rounded-md",
"flex h-9 items-center gap-px rounded-md sm:h-[30px]",
isActive ? "bg-accent text-accent-foreground" : "hover:bg-accent hover:text-accent-foreground"
)}
>
<Link href="/pages" className="flex flex-1 items-center justify-start rounded-md px-2 py-1">
<p className="text-xs">
<p className="text-sm sm:text-xs">
Pages
{pageCount > 0 && <span className="text-muted-foreground ml-1">{pageCount}</span>}
</p>
@@ -165,7 +165,7 @@ const PageListItem: React.FC<PageListItemProps> = ({ page, isActive }) => (
<Link
href={`/pages/${page.id}`}
className={cn(
"group-hover/sidebar-link:bg-accent group-hover/sidebar-link:text-accent-foreground relative flex h-8 w-full items-center gap-2 rounded-md p-1.5 font-medium",
"group-hover/sidebar-link:bg-accent group-hover/sidebar-link:text-accent-foreground relative flex h-9 w-full items-center gap-2 rounded-md p-1.5 font-medium sm:h-8",
{ "bg-accent text-accent-foreground": isActive }
)}
>

9
web/components/custom/sidebar/partial/topic-section.tsx
View File

@@ -3,7 +3,6 @@ import Link from "next/link"
import { usePathname } from "next/navigation"
import { useAccount } from "@/lib/providers/jazz-provider"
import { cn } from "@/lib/utils"
import { Button } from "@/components/ui/button"
import { LaIcon } from "@/components/custom/la-icon"
import { ListOfTopics } from "@/lib/schema"
import { LEARNING_STATES, LearningStateValue } from "@/lib/constants"
@@ -46,12 +45,12 @@ interface TopicSectionHeaderProps {
const TopicSectionHeader: React.FC<TopicSectionHeaderProps> = ({ topicCount, isActive }) => (
<div
className={cn(
"flex min-h-[30px] items-center gap-px rounded-md",
"flex h-9 items-center gap-px rounded-md sm:h-[30px]",
isActive ? "bg-accent text-accent-foreground" : "hover:bg-accent hover:text-accent-foreground"
)}
>
<Link href="/topics" className="flex flex-1 items-center justify-start rounded-md px-2 py-1">
<p className="text-xs">
<p className="text-sm sm:text-xs">
Topics
{topicCount > 0 && <span className="text-muted-foreground ml-1">{topicCount}</span>}
</p>
@@ -115,9 +114,9 @@ const ListItem: React.FC<ListItemProps> = ({ label, value, href, count, isActive
<div className="group/reorder-page relative">
<div className="group/topic-link relative flex min-w-0 flex-1">
<Link
href={"#"}
href={href}
className={cn(
"group-hover/topic-link:bg-accent relative flex h-8 w-full items-center gap-2 rounded-md p-1.5 font-medium",
"group-hover/topic-link:bg-accent relative flex h-9 w-full items-center gap-2 rounded-md p-1.5 font-medium sm:h-8",
{ "bg-accent text-accent-foreground": isActive },
le.className
)}