Skip to content

Commit cbd66dc

Browse files
committed
Adding design/copy/feedback updates
1 parent 76a9406 commit cbd66dc

File tree

15 files changed

+342
-239
lines changed

15 files changed

+342
-239
lines changed

bootstrap/ssr/ssr-manifest.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
{
22
"resources/js/components/app-header.tsx": [],
3+
"resources/js/components/app-shell.tsx": [],
34
"resources/js/components/app-sidebar.tsx": [],
45
"resources/js/components/appearance-tabs.tsx": [],
56
"resources/js/components/application-logo.tsx": [],
7+
"resources/js/components/delete-user.tsx": [],
8+
"resources/js/components/heading-small.tsx": [],
69
"resources/js/components/heading.tsx": [],
710
"resources/js/components/input-error.tsx": [],
811
"resources/js/components/nav-footer.tsx": [],
912
"resources/js/components/nav-main.tsx": [],
1013
"resources/js/components/nav-user.tsx": [],
11-
"resources/js/components/settings/delete-user.tsx": [],
12-
"resources/js/components/settings/heading.tsx": [],
14+
"resources/js/components/text-link.tsx": [],
1315
"resources/js/components/ui/avatar.tsx": [],
1416
"resources/js/components/ui/breadcrumb.tsx": [],
1517
"resources/js/components/ui/button.tsx": [],
@@ -25,8 +27,9 @@
2527
"resources/js/hooks/use-appearance.tsx": [],
2628
"resources/js/hooks/use-mobile.tsx": [],
2729
"resources/js/layouts/app-layout.tsx": [],
28-
"resources/js/layouts/auth/auth-base.tsx": [],
30+
"resources/js/layouts/auth-layout.tsx": [],
2931
"resources/js/layouts/auth/auth-simple-layout.tsx": [],
32+
"resources/js/layouts/settings/layout.tsx": [],
3033
"resources/js/lib/utils.ts": [],
3134
"resources/js/pages/auth/confirm-password.tsx": [],
3235
"resources/js/pages/auth/forgot-password.tsx": [],
@@ -36,7 +39,6 @@
3639
"resources/js/pages/auth/verify-email.tsx": [],
3740
"resources/js/pages/dashboard.tsx": [],
3841
"resources/js/pages/settings/appearance.tsx": [],
39-
"resources/js/pages/settings/layout.tsx": [],
4042
"resources/js/pages/settings/password.tsx": [],
4143
"resources/js/pages/settings/profile.tsx": [],
4244
"resources/js/pages/welcome.tsx": [],

bootstrap/ssr/ssr.js

Lines changed: 258 additions & 185 deletions
Large diffs are not rendered by default.

resources/css/app.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
--chart-5: 27 87% 67%;
3131
--radius: 0.5rem;
3232
--sidebar-background: 0 0% 98%;
33-
--sidebar-foreground: 240 5.3% 26.1%;
33+
--sidebar-foreground: 240 5.3% 30%;
3434
--sidebar-primary: 0 0% 10%;
3535
--sidebar-primary-foreground: 0 0% 98%;
3636
--sidebar-accent: 0 0% 94%;
@@ -54,7 +54,7 @@
5454
--muted-foreground: 0 0% 63.9%;
5555
--accent: 0 0% 14.9%;
5656
--accent-foreground: 0 0% 98%;
57-
--destructive: 0 62.8% 30.6%;
57+
--destructive: 0 84% 60%;
5858
--destructive-foreground: 0 0% 98%;
5959
--border: 0 0% 14.9%;
6060
--input: 0 0% 14.9%;
@@ -65,8 +65,8 @@
6565
--chart-4: 280 65% 60%;
6666
--chart-5: 340 75% 55%;
6767
--sidebar-background: 0 0% 7%;
68-
--sidebar-foreground: 0 0% 95.9%;
69-
--sidebar-primary: 6, 72%, 55%;
68+
--sidebar-foreground: 0 0% 80%;
69+
--sidebar-primary: 360, 100%, 100%;
7070
--sidebar-primary-foreground: 0 0% 100%;
7171
--sidebar-accent: 0 0% 15.9%;
7272
--sidebar-accent-foreground: 240 4.8% 95.9%;
@@ -83,4 +83,4 @@
8383
body {
8484
@apply bg-background text-foreground;
8585
}
86-
}
86+
}

resources/js/components/app-header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Fragment } from 'react';
55

66
export function AppHeader({ breadcrumbs = [] }: { breadcrumbs?: BreadcrumbItemType[] }) {
77
return (
8-
<header className="flex h-16 w-full shrink-0 items-center justify-between gap-2 border-b px-4">
8+
<header className="flex h-16 shrink-0 items-center gap-2 px-4 transition-[width,height] ease-linear group-has-[[data-collapsible=icon]]/sidebar-wrapper:h-12">
99
<div className="flex items-center gap-2">
1010
<SidebarTrigger className="-ml-1" />
1111
{breadcrumbs.length > 0 && (

resources/js/components/app-sidebar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ export function AppSidebar() {
3535
<SidebarMenu>
3636
<SidebarMenuItem>
3737
<SidebarMenuButton size="lg" asChild>
38-
<Link href="/dashboard" className="flex items-center gap-3" prefetch>
38+
<Link href="/dashboard" prefetch>
3939
<div className="flex aspect-square size-8 items-center justify-center rounded-md bg-sidebar-primary text-sidebar-primary-foreground">
40-
<ApplicationLogo className="size-5 fill-current text-white" />
40+
<ApplicationLogo className="size-5 fill-current text-white dark:text-black" />
4141
</div>
4242
<div className="grid flex-1 text-left text-sm leading-tight">
4343
<span className="truncate font-semibold">Laravel</span>

resources/js/components/delete-user.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ export default function DeleteUser() {
4141
};
4242

4343
return (
44-
<div>
45-
<HeadingSmall title="Delete Account" description="Delete your account and all of its resources" />
46-
<div className="flex items-center rounded-lg border border-red-100 bg-red-50 p-3 dark:border-red-950 dark:bg-red-500/20">
44+
<div className="space-y-6">
45+
<HeadingSmall title="Delete account" description="Delete your account and all of its resources" />
46+
<div className="flex items-center rounded-lg border border-red-100 bg-red-50 p-3 dark:border-red-950 dark:bg-red-700/10">
4747
<Dialog>
4848
<DialogTrigger asChild>
49-
<Button variant="destructive">Delete Account</Button>
49+
<Button variant="destructive">Delete account</Button>
5050
</DialogTrigger>
5151
<DialogContent>
5252
<form className="space-y-6" onSubmit={deleteUser}>
@@ -83,7 +83,7 @@ export default function DeleteUser() {
8383
</DialogClose>
8484

8585
<Button variant="destructive" disabled={processing} asChild>
86-
<button type="submit">Delete Account</button>
86+
<button type="submit">Delete account</button>
8787
</Button>
8888
</DialogFooter>
8989
</form>
Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
import { Separator } from '@/components/ui/separator';
2-
31
export default function HeadingSmall({ title, description }: { title: string; description?: string }) {
42
return (
5-
<div>
6-
<header>
7-
<h3 className="mb-1 text-lg font-medium">{title}</h3>
8-
{description && <p className="text-sm text-muted-foreground">{description}</p>}
9-
</header>
10-
<Separator className="my-6" />
11-
</div>
3+
<header>
4+
<h3 class="mb-0.5 text-base font-medium">{title}</h3>
5+
{description && <p className="text-xs text-muted-foreground">{description}</p>}
6+
</header>
127
);
138
}

resources/js/components/heading.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ export default function Heading({ title, description }: { title: string; descrip
44
return (
55
<>
66
<div className="space-y-0.5">
7-
<h2 className="text-lg font-bold tracking-tight sm:text-xl md:text-2xl">{title}</h2>
8-
{description && <p className="text-sm text-muted-foreground md:text-base">{description}</p>}
7+
<h2 className="text-base font-semibold tracking-tight sm:text-lg lg:text-xl">{title}</h2>
8+
{description && <p className="text-xs text-muted-foreground md:text-sm">{description}</p>}
99
</div>
1010
<Separator className="my-6" />
1111
</>

resources/js/components/nav-footer.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { SidebarGroup, SidebarGroupContent, SidebarMenu, SidebarMenuAction, SidebarMenuButton, SidebarMenuItem } from '@/components/ui/sidebar';
1+
import { SidebarGroup, SidebarGroupContent, SidebarMenu, SidebarMenuButton, SidebarMenuItem } from '@/components/ui/sidebar';
22
import { type NavItem } from '@/types';
3-
import { ExternalLink } from 'lucide-react';
43

54
export function NavFooter({
65
items,

resources/js/layouts/app-layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { AppHeader } from '@/components/app-header';
22
import { AppShell } from '@/components/app-shell';
33
import { AppSidebar } from '@/components/app-sidebar';
4-
import { type BreadcrumbItem } from '@/types';
54
import { SidebarInset } from '@/components/ui/sidebar';
5+
import { type BreadcrumbItem } from '@/types';
66

77
export default function App({ children, breadcrumbs = [] }: { children: React.ReactNode; breadcrumbs?: BreadcrumbItem[] }) {
88
return (

0 commit comments

Comments
 (0)