Skip to content

Commit

Permalink
fix heading
Browse files Browse the repository at this point in the history
  • Loading branch information
irsyadadl committed Sep 6, 2024
1 parent f61d4fa commit c40a72d
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 30 deletions.
42 changes: 22 additions & 20 deletions components/navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,26 +156,28 @@ export function NavbarDropdown() {
</span>
</Button>
<Menu.Content placement="bottom" className="sm:min-w-64">
<Menu.Item href="/">
<IconHome />
Home
</Menu.Item>
<Menu.Item href="/components">
<IconCube />
Components
</Menu.Item>
<Menu.Item href="/colors">
<IconColors />
Colors
</Menu.Item>
<Menu.Item href="/icons">
<IconBrandJustd />
Icons
</Menu.Item>
<Menu.Item href="/themes">
<IconColorPalette />
Themes
</Menu.Item>
<Menu.Section>
<Menu.Item href="/">
<IconHome />
Home
</Menu.Item>
<Menu.Item href="/components">
<IconCube />
Components
</Menu.Item>
<Menu.Item href="/colors">
<IconColors />
Colors
</Menu.Item>
<Menu.Item href="/icons">
<IconBrandJustd />
Icons
</Menu.Item>
<Menu.Item href="/themes">
<IconColorPalette />
Themes
</Menu.Item>
</Menu.Section>
<Menu.Section title="Refs">
<Menu.Item href="https://x.com/intent/follow?screen_name=getjustd" target="_blank">
<IconBrandX />X / Twitter
Expand Down
10 changes: 3 additions & 7 deletions components/ui/dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,7 @@ const Header = ({ className, ...props }: DialogHeaderProps) => {
)
}

type DialogTitleProps = HeadingProps & {
className?: string
}

const Title = ({ tracking = "tight", level = 2, className, ...props }: DialogTitleProps) => (
const Title = ({ tracking = "tight", level = 2, className, ...props }: HeadingProps) => (
<Heading
slot="title"
tracking={tracking}
Expand All @@ -91,8 +87,8 @@ const Title = ({ tracking = "tight", level = 2, className, ...props }: DialogTit
/>
)

const Description = ({ className, ...props }: HeadingProps) => (
<p className={description({ className })} {...props} />
const Description = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
<div className={description({ className })} {...props} />
)

const Body = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
Expand Down
4 changes: 1 addition & 3 deletions components/ui/heading.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import { Heading as HeadingPrimitive } from "react-aria-components"
import { tv } from "tailwind-variants"

import { isIos } from "./primitive"

const headingStyles = tv({
base: "font-sans tracking-tight text-fg",
variants: {
Expand Down Expand Up @@ -40,7 +38,7 @@ const Heading = ({ className, tracking = "normal", level = 1, ...props }: Headin
className={headingStyles({
level,
tracking,
className: isIos() ? "font-medium" : className
className
})}
{...props}
/>
Expand Down

0 comments on commit c40a72d

Please sign in to comment.