Merge branch 'ui-pass' of https://github.com/laravel/vue-starter-kit into ui-pass

tnylea · tnylea · commit 0f9c0ebc0f5c · 2025-02-23T20:23:44.000-05:00
diff --git a/resources/js/components/AppSidebar.vue b/resources/js/components/AppSidebar.vue
@@ -30,7 +30,7 @@ const footerNavItems: NavItem[] = [
 </script>
 
 <template>
-    <Sidebar collapsible="icon" variant="sidebar">
+    <Sidebar collapsible="icon" variant="inset">
         <SidebarHeader>
             <SidebarMenu>
                 <SidebarMenuItem>
diff --git a/resources/js/pages/auth/VerifyEmail.vue b/resources/js/pages/auth/VerifyEmail.vue
@@ -20,17 +20,12 @@ const submit = () => {
     <AuthLayout title="Verify email" description="Please verify your email address by clicking on the link we just emailed to you.">
         <Head title="Email verification" />
 
-        <div class="mb-4 text-sm text-gray-600">
-            Thanks for signing up! Before getting started, could you verify your email address by clicking on the link we just emailed to you? If you
-            didn't receive the email, we will gladly send you another
-        </div>
-
-        <div v-if="status === 'verification-link-sent'" class="mb-4 text-sm font-medium text-green-600">
-            A new verification link has been sent to the email address you provided during registration
+        <div v-if="status === 'verification-link-sent'" class="mb-4 text-center text-sm font-medium text-green-600">
+            A new verification link has been sent to the email address you provided during registration.
         </div>
 
         <form @submit.prevent="submit" class="space-y-6 text-center">
-            <Button :disabled="form.processing">
+            <Button :disabled="form.processing" variant="secondary">
                 <LoaderCircle v-if="form.processing" class="h-4 w-4 animate-spin" />
                 Resend verification email
             </Button>
@@ -41,7 +36,7 @@ const submit = () => {
                 as="button"
                 class="mx-auto block text-sm"
             >
-                Log Out
+                Log out
             </TextLink>
         </form>
     </AuthLayout>
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
@@ -6,8 +6,8 @@
 
         <title inertia>{{ config('app.name', 'Laravel') }}</title>
 
-        <link rel="preconnect" href="https://rsms.me/">
-        <link rel="stylesheet" href="https://rsms.me/inter/inter.css">
+        <link rel="preconnect" href="https://fonts.bunny.net">
+        <link href="https://fonts.bunny.net/css?family=instrument-sans:400,500,600" rel="stylesheet" />
 
         @routes
         @vite(['resources/js/app.ts'])
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -12,7 +12,7 @@ export default {
     theme: {
         extend: {
             fontFamily: {
-                sans: ['Figtree', ...defaultTheme.fontFamily.sans],
+                sans: ['Instrument Sans', ...defaultTheme.fontFamily.sans],
             },
             borderRadius: {
                 lg: 'var(--radius)',
