Skip to content

Commit 949ce87

Browse files
committed
better layout
1 parent e1f2c81 commit 949ce87

File tree

7 files changed

+38
-26
lines changed

7 files changed

+38
-26
lines changed

www/src/app/(home)/layout.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default function HomeLayout({
1212
<div>
1313
<Header className="hidden md:block" />
1414
<MobileNav items={source.pageTree.children} className="md:hidden" />
15-
<div className="mx-auto min-h-screen max-w-screen-2xl sm:grid sm:grid-cols-[20px_1fr_20px] md:grid-cols-[30px_1fr_30px] lg:grid-cols-[50px_1fr_50px]">
15+
<div className="mx-auto min-h-screen max-w-screen-2xl sm:grid sm:grid-cols-[20px_1fr_20px] md:grid-cols-[30px_1fr_30px]">
1616
<div className="diagonal-pattern hidden sm:block" />
1717
<div className="">
1818
<div className="min-h-[70vh]">{children}</div>

www/src/app/(home)/page.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ export default function HomePage() {
1818
return (
1919
<div>
2020
{/* Hero section */}
21-
<div className="container">
22-
<section className="max-w-3xl pb-20 pt-14 sm:pt-24 lg:pb-32">
21+
<div className="container max-w-screen-2xl">
22+
<section className="max-w-3xl pb-20 pt-10 sm:pt-14">
2323
<Button
2424
href="/themes"
2525
prefix={<LayoutTemplateIcon />}
@@ -28,15 +28,15 @@ export default function HomePage() {
2828
>
2929
Introducing themes
3030
</Button>
31-
<h1 className="xs:text-3xl text-balance text-2xl tracking-tighter max-lg:font-medium sm:text-4xl md:text-5xl lg:text-6xl">
31+
<h1 className="xs:text-3xl text-balance text-2xl tracking-tighter max-lg:font-medium md:text-4xl lg:text-5xl">
3232
Quickly build your component library with a{" "}
3333
<span className="font-bold italic">unique</span> look.
3434
</h1>
35-
<p className="text-fg-muted text-balace mt-2 text-lg md:mt-4">
35+
<p className="text-fg-muted text-balace mt-2 text-lg">
3636
Over 40 components available in multiple variants ready to match
3737
your brand identity.
3838
</p>
39-
<div className="mt-4 flex flex-col gap-2 sm:mt-8 sm:flex-row sm:items-center sm:gap-4">
39+
<div className="mt-4 flex flex-col gap-2 sm:flex-row sm:items-center sm:gap-4">
4040
<Button
4141
href="/docs/getting-started/introduction"
4242
variant="primary"
@@ -57,7 +57,7 @@ export default function HomePage() {
5757
</section>
5858
</div>
5959
{/* Components overview */}
60-
<section className="px-4 sm:px-8">
60+
<section className="container max-w-screen-2xl">
6161
<ThemesOverview />
6262
</section>
6363
<section className="shadow-xs mt-10 border-y py-12 lg:py-8">

www/src/components/demos/button/loading.tsx

+24-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,31 @@
1+
"use client";
2+
3+
import React from "react";
14
import { Button } from "@/components/dynamic-core/button";
25

36
export default function Demo() {
7+
const [isPending, setPending] = React.useState(false);
48
return (
5-
<div className="flex w-full items-center justify-center gap-2">
6-
<Button size="sm" isPending>
7-
Button
8-
</Button>
9-
<Button size="md" isPending>
10-
Button
11-
</Button>
12-
<Button size="lg" isPending>
13-
Button
9+
<div className="flex flex-col items-center gap-4">
10+
<div className="flex w-full items-center justify-center gap-2">
11+
<Button size="sm" isPending>
12+
Button
13+
</Button>
14+
<Button size="md" isPending>
15+
Button
16+
</Button>
17+
<Button size="lg" isPending>
18+
Button
19+
</Button>
20+
</div>
21+
<Button
22+
isPending={isPending}
23+
onPress={() => {
24+
setPending(true);
25+
setTimeout(() => setPending(false), 2000);
26+
}}
27+
>
28+
Click me
1429
</Button>
1530
</div>
1631
);

www/src/components/header.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { Button } from "@/components/core/button";
88
import { siteConfig } from "@/config";
99
import { Kbd } from "./core/kbd";
1010
import { GitHubIcon, TwitterIcon } from "./icons";
11+
import { Logo } from "./logo";
1112
import { SearchCommand } from "./search-command";
1213
import { ThemeColorsSelector } from "./theme-colors-selector";
1314
import { ThemeSwitcher } from "./theme-switcher";
@@ -19,7 +20,7 @@ export function Header({ className }: { className?: string }) {
1920
>
2021
<div className="px-12.5 container relative flex h-14 max-w-screen-2xl items-center justify-between">
2122
<div className="flex items-center gap-6">
22-
{/* <Logo /> */}
23+
<Logo />
2324
<div className="flex items-center gap-3 text-sm">
2425
{[
2526
{ label: "Docs", href: "/docs/getting-started/introduction" },

www/src/modules/themes/components/themes-overview.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export const ThemesOverview = () => {
5757

5858
return (
5959
<div className="flex flex-col items-center gap-10 md:gap-4">
60-
<div className="container relative flex flex-col items-center gap-6">
60+
<div className="container relative flex max-w-screen-2xl flex-col items-center gap-6">
6161
<div className="text-fg-muted relative flex items-center gap-2 py-2 pl-4 pr-2 font-mono text-xs">
6262
<motion.div
6363
layout
@@ -209,7 +209,7 @@ export const ThemesOverview = () => {
209209
animate="show"
210210
exit="hidden"
211211
>
212-
<ComponentsOverview className="hidden xl:container sm:grid" />
212+
<ComponentsOverview className="hidden sm:grid" />
213213
<MobileComponentsOverview className="sm:hidden" />
214214
</motion.div>
215215
</AnimatePresence>

www/src/registry/core/button_basic.tsx

+3-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { focusRing } from "@/registry/lib/focus-styles";
1515

1616
const buttonStyles = tv({
1717
extend: focusRing,
18-
base: "disabled:bg-bg-disabled disabled:text-fg-disabled pending:cursor-default pending:bg-bg-disabled pending:text-fg-disabled pending:border pending:border-border-disabled inline-flex shrink-0 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium leading-normal transition-all disabled:cursor-default",
18+
base: "disabled:bg-bg-disabled disabled:text-fg-disabled pending:cursor-default pending:bg-bg-disabled pending:text-fg-disabled pending:border pending:border-border-disabled pending:**:not-data-[slot=spinner]:not-in-data-[slot=spinner]:opacity-0 relative inline-flex shrink-0 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium leading-normal transition-all disabled:cursor-default",
1919
variants: {
2020
variant: {
2121
default:
@@ -102,17 +102,14 @@ const Button = React.forwardRef(
102102
<>
103103
{isPending && (
104104
<Loader
105+
data-slot="spinner"
105106
aria-label="loading"
106107
className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2"
107108
size={16}
108109
/>
109110
)}
110111
{prefix}
111-
{typeof children === "string" ? (
112-
<span className="truncate">{children}</span>
113-
) : (
114-
children
115-
)}
112+
<span className="truncate">{children}</span>
116113
{suffix}
117114
</>
118115
))}

www/src/styles/docs.css

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
padding-inline: 1rem;
55

66
@media (width >= --theme(--breakpoint-sm)) {
7-
max-width: var(--container-7xl);
87
padding-inline: 2rem;
98
}
109
}

0 commit comments

Comments
 (0)