From 271dd996315394aa2a210a1481e46f23c502dc21 Mon Sep 17 00:00:00 2001 From: SameerJadav Date: Tue, 15 Aug 2023 10:12:38 +0530 Subject: [PATCH 01/12] refactor: correct contrast ratio & accessible name --- docs/next.config.mjs | 2 +- docs/src/app/page.tsx | 4 ++-- docs/src/components/mobile-nav.tsx | 1 + docs/src/styles/globals.css | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/next.config.mjs b/docs/next.config.mjs index 97b3362..bbbe4f0 100644 --- a/docs/next.config.mjs +++ b/docs/next.config.mjs @@ -20,7 +20,7 @@ export default withMdx({ rehypePrettyCode, /** @type {import("rehype-pretty-code").Options} */ ({ - theme: { dark: "one-dark-pro", light: "github-light" }, + theme: { dark: "one-dark-pro", light: "min-light" }, getHighlighter, onVisitLine(node) { // Prevent lines from collapsing in `display: grid` mode, and allow empty diff --git a/docs/src/app/page.tsx b/docs/src/app/page.tsx index f04243d..0df43a7 100644 --- a/docs/src/app/page.tsx +++ b/docs/src/app/page.tsx @@ -22,7 +22,7 @@ export default function IndexPage() {

{siteConfig.description} @@ -44,7 +44,7 @@ export default function IndexPage() { className={buttonVariants({ variant: "outline", size: "lg" })} > - GitHub + GitHub diff --git a/docs/src/components/mobile-nav.tsx b/docs/src/components/mobile-nav.tsx index ccc9f2d..8cf7a50 100644 --- a/docs/src/components/mobile-nav.tsx +++ b/docs/src/components/mobile-nav.tsx @@ -37,6 +37,7 @@ export function MobileDropdown(props: { className="mr-2 px-0 hamburger space-x-2 hover:bg-transparent focus-visible:bg-transparent focus-visible:ring-0 focus-visible:ring-offset-0 md:hidden" > + Menu diff --git a/docs/src/styles/globals.css b/docs/src/styles/globals.css index 9b4148b..d15909e 100644 --- a/docs/src/styles/globals.css +++ b/docs/src/styles/globals.css @@ -7,8 +7,8 @@ --background: 0 0% 100%; --foreground: 222.2 47.4% 11.2%; - --muted: 210 40% 96.1%; - --muted-foreground: 215.4 16.3% 46.9%; + --muted: 270 20% 98%; + --muted-foreground: 252 5% 40.7%; --popover: 0 0% 100%; --popover-foreground: 222.2 47.4% 11.2%; From b0aba7480a670dcb315b1dff7ac03925f849f2cd Mon Sep 17 00:00:00 2001 From: SameerJadav Date: Tue, 15 Aug 2023 10:20:39 +0530 Subject: [PATCH 02/12] fix: main nav link active state --- docs/src/components/main-nav.tsx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/docs/src/components/main-nav.tsx b/docs/src/components/main-nav.tsx index 5c26454..5f026d2 100644 --- a/docs/src/components/main-nav.tsx +++ b/docs/src/components/main-nav.tsx @@ -5,7 +5,7 @@ import Link from "next/link"; import { cn } from "@/lib/cn"; import { Icons } from "@/components/icons"; -import { usePathname } from "next/navigation"; +import { useSelectedLayoutSegment } from "next/navigation"; export interface NavItem { title: string; @@ -16,9 +16,13 @@ export interface NavItem { label?: string; } -export function MainNav(props: { items: NavItem[] }) { - const pathname = usePathname(); +function isActive(href: string) { + const segment = useSelectedLayoutSegment(); + if (!segment) return false; + return href.startsWith(`/${segment}`); +} +export function MainNav(props: { items: NavItem[] }) { return (

{props.items?.length ? ( @@ -30,9 +34,9 @@ export function MainNav(props: { items: NavItem[] }) { key={index} href={item.href} className={cn( - "text-muted-foreground flex items-center justify-center rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none ring-offset-background hover:bg-accent hover:text-accent-foreground h-9 px-3", + "text-foreground/60 text-sm font-medium transition-colors hover:text-foreground/80 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none ring-offset-background rounded-sm", item.disabled && "cursor-not-allowed opacity-80", - item.href === pathname && "text-foreground" + isActive(item.href) && "text-foreground" )} > {item.title} From 629e269c4a343016d7ca40e92f7cd19baba4bf03 Mon Sep 17 00:00:00 2001 From: SameerJadav Date: Tue, 15 Aug 2023 10:57:57 +0530 Subject: [PATCH 03/12] style: fix some style issues with header --- docs/src/components/main-nav.tsx | 40 ++++++++--------- docs/src/components/mobile-nav.tsx | 3 +- docs/src/components/site-header.tsx | 66 ++++++++++++++-------------- docs/src/components/theme-toggle.tsx | 6 +-- docs/src/components/ui/button.tsx | 3 +- 5 files changed, 59 insertions(+), 59 deletions(-) diff --git a/docs/src/components/main-nav.tsx b/docs/src/components/main-nav.tsx index 5f026d2..94e6a0c 100644 --- a/docs/src/components/main-nav.tsx +++ b/docs/src/components/main-nav.tsx @@ -24,27 +24,23 @@ function isActive(href: string) { export function MainNav(props: { items: NavItem[] }) { return ( -
- {props.items?.length ? ( - - ) : null} -
+ ); } diff --git a/docs/src/components/mobile-nav.tsx b/docs/src/components/mobile-nav.tsx index 8cf7a50..8cb7cff 100644 --- a/docs/src/components/mobile-nav.tsx +++ b/docs/src/components/mobile-nav.tsx @@ -34,7 +34,8 @@ export function MobileDropdown(props: { ); diff --git a/docs/src/components/ui/button.tsx b/docs/src/components/ui/button.tsx index 8854a31..10c4591 100644 --- a/docs/src/components/ui/button.tsx +++ b/docs/src/components/ui/button.tsx @@ -19,9 +19,10 @@ const buttonVariants = cva( link: "underline-offset-4 hover:underline text-primary", }, size: { + lg: "h-11 px-8 rounded-md", default: "h-10 py-2 px-4", sm: "h-9 px-3 rounded-md", - lg: "h-11 px-8 rounded-md", + icon: "p-1", }, }, defaultVariants: { From 511d1545a61f7c07908d41b0a980583adad56eae Mon Sep 17 00:00:00 2001 From: SameerJadav Date: Tue, 15 Aug 2023 12:58:41 +0530 Subject: [PATCH 04/12] style: consistent styling --- docs/src/app/docs/layout.tsx | 2 +- docs/src/app/page.tsx | 2 +- docs/src/components/mobile-nav.tsx | 2 +- docs/src/components/site-header.tsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/src/app/docs/layout.tsx b/docs/src/app/docs/layout.tsx index ec5e67f..56e0a3e 100644 --- a/docs/src/app/docs/layout.tsx +++ b/docs/src/app/docs/layout.tsx @@ -14,7 +14,7 @@ export const metadata: Metadata = { export default function DocsLayout(props: { children: ReactNode }) { return (
-