Skip to content

Commit bc4c91e

Browse files
grgsbitgrgsbit
committed
[lot] a lot
2 parents 2683971 + fbae2a4 commit bc4c91e

File tree

8 files changed

+87
-12
lines changed

8 files changed

+87
-12
lines changed

‎resources/css/app.css‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,82 @@
138138
}
139139
}
140140

141+
<<<<<<< HEAD
142+
=======
143+
:root {
144+
--background: hsl(0 0% 100%);
145+
--foreground: hsl(0 0% 3.9%);
146+
--card: hsl(0 0% 100%);
147+
--card-foreground: hsl(0 0% 3.9%);
148+
--popover: hsl(0 0% 100%);
149+
--popover-foreground: hsl(0 0% 3.9%);
150+
--primary: hsl(0 0% 9%);
151+
--primary-foreground: hsl(0 0% 98%);
152+
--secondary: hsl(0 0% 92.1%);
153+
--secondary-foreground: hsl(0 0% 9%);
154+
--muted: hsl(0 0% 96.1%);
155+
--muted-foreground: hsl(0 0% 45.1%);
156+
--accent: hsl(0 0% 96.1%);
157+
--accent-foreground: hsl(0 0% 9%);
158+
--destructive: hsl(0 84.2% 60.2%);
159+
--destructive-foreground: hsl(0 0% 98%);
160+
--border: hsl(0 0% 92.8%);
161+
--input: hsl(0 0% 89.8%);
162+
--ring: hsl(0 0% 3.9%);
163+
--chart-1: hsl(12 76% 61%);
164+
--chart-2: hsl(173 58% 39%);
165+
--chart-3: hsl(197 37% 24%);
166+
--chart-4: hsl(43 74% 66%);
167+
--chart-5: hsl(27 87% 67%);
168+
--radius: 0.5rem;
169+
--sidebar-background: hsl(0 0% 98%);
170+
--sidebar-foreground: hsl(240 5.3% 26.1%);
171+
--sidebar-primary: hsl(0 0% 10%);
172+
--sidebar-primary-foreground: hsl(0 0% 98%);
173+
--sidebar-accent: hsl(0 0% 94%);
174+
--sidebar-accent-foreground: hsl(0 0% 30%);
175+
--sidebar-border: hsl(0 0% 91%);
176+
--sidebar-ring: hsl(217.2 91.2% 59.8%);
177+
--sidebar: hsl(0 0% 98%);
178+
}
179+
180+
.dark {
181+
--background: hsl(0 0% 3.9%);
182+
--foreground: hsl(0 0% 98%);
183+
--card: hsl(0 0% 3.9%);
184+
--card-foreground: hsl(0 0% 98%);
185+
--popover: hsl(0 0% 3.9%);
186+
--popover-foreground: hsl(0 0% 98%);
187+
--primary: hsl(0 0% 98%);
188+
--primary-foreground: hsl(0 0% 9%);
189+
--secondary: hsl(0 0% 14.9%);
190+
--secondary-foreground: hsl(0 0% 98%);
191+
--muted: hsl(0 0% 16.08%);
192+
--muted-foreground: hsl(0 0% 63.9%);
193+
--accent: hsl(0 0% 14.9%);
194+
--accent-foreground: hsl(0 0% 98%);
195+
--destructive: hsl(0 84% 60%);
196+
--destructive-foreground: hsl(0 0% 98%);
197+
--border: hsl(0 0% 14.9%);
198+
--input: hsl(0 0% 14.9%);
199+
--ring: hsl(0 0% 83.1%);
200+
--chart-1: hsl(220 70% 50%);
201+
--chart-2: hsl(160 60% 45%);
202+
--chart-3: hsl(30 80% 55%);
203+
--chart-4: hsl(280 65% 60%);
204+
--chart-5: hsl(340 75% 55%);
205+
--sidebar-background: hsl(0 0% 7%);
206+
--sidebar-foreground: hsl(0 0% 95.9%);
207+
--sidebar-primary: hsl(360, 100%, 100%);
208+
--sidebar-primary-foreground: hsl(0 0% 100%);
209+
--sidebar-accent: hsl(0 0% 15.9%);
210+
--sidebar-accent-foreground: hsl(240 4.8% 95.9%);
211+
--sidebar-border: hsl(0 0% 15.9%);
212+
--sidebar-ring: hsl(217.2 91.2% 59.8%);
213+
--sidebar: hsl(240 5.9% 10%);
214+
}
215+
216+
>>>>>>> fbae2a4df2eec7e4f7c857ffe50db2b78473ce3f
141217
@layer base {
142218
* {
143219
@apply border-border outline-ring/50;

‎resources/js/layouts/app/AppSidebarLayout.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ withDefaults(defineProps<Props>(), {
1717
<template>
1818
<AppShell variant="sidebar">
1919
<AppSidebar />
20-
<AppContent variant="sidebar">
20+
<AppContent variant="sidebar" class="overflow-x-hidden">
2121
<AppSidebarHeader :breadcrumbs="breadcrumbs" />
2222
<slot />
2323
</AppContent>

‎resources/js/pages/Dashboard.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const breadcrumbs: BreadcrumbItem[] = [
1616
<Head title="Dashboard" />
1717

1818
<AppLayout :breadcrumbs="breadcrumbs">
19-
<div class="flex h-full flex-1 flex-col gap-4 rounded-xl p-4">
19+
<div class="flex h-full flex-1 flex-col gap-4 rounded-xl p-4 overflow-x-auto">
2020
<div class="grid auto-rows-min gap-4 md:grid-cols-3">
2121
<div class="relative aspect-video overflow-hidden rounded-xl border border-sidebar-border/70 dark:border-sidebar-border">
2222
<PlaceholderPattern />

‎resources/js/pages/settings/Profile.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ interface Props {
1818
1919
defineProps<Props>();
2020
21-
const breadcrumbs: BreadcrumbItem[] = [
21+
const breadcrumbItems: BreadcrumbItem[] = [
2222
{
2323
title: 'Profile settings',
2424
href: '/settings/profile',
@@ -41,7 +41,7 @@ const submit = () => {
4141
</script>
4242

4343
<template>
44-
<AppLayout :breadcrumbs="breadcrumbs">
44+
<AppLayout :breadcrumbs="breadcrumbItems">
4545
<Head title="Profile settings" />
4646

4747
<SettingsLayout>

‎resources/js/ssr.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ createServer((page) =>
1111
createInertiaApp({
1212
page,
1313
render: renderToString,
14-
title: (title) => `${title} - ${appName}`,
14+
title: (title) => title ? `${title} - ${appName}` : appName,
1515
resolve: resolvePage,
1616
setup: ({ App, props, plugin }) =>
1717
createSSRApp({ render: () => h(App, props) })

‎resources/js/types/globals.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ declare module '@inertiajs/core' {
1717
interface PageProps extends InertiaPageProps, AppPageProps {}
1818
}
1919

20-
declare module '@vue/runtime-core' {
20+
declare module 'vue' {
2121
interface ComponentCustomProperties {
2222
$inertia: typeof Router;
2323
$page: Page;

‎resources/js/types/ziggy.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ declare global {
44
let route: typeof route;
55
}
66

7-
declare module '@vue/runtime-core' {
7+
declare module 'vue' {
88
interface ComponentCustomProperties {
99
route: typeof route;
1010
}

‎vite.config.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
import tailwindcss from '@tailwindcss/vite';
22
import vue from '@vitejs/plugin-vue';
33
import laravel from 'laravel-vite-plugin';
4+
<<<<<<< HEAD
45
import i18n from 'laravel-vue-i18n/vite';
56
import path from 'path';
7+
=======
8+
import tailwindcss from '@tailwindcss/vite';
9+
>>>>>>> fbae2a4df2eec7e4f7c857ffe50db2b78473ce3f
610
import { defineConfig } from 'vite';
711

812
export default defineConfig({
@@ -29,9 +33,4 @@ export default defineConfig({
2933
}),
3034
i18n(),
3135
],
32-
resolve: {
33-
alias: {
34-
'@': path.resolve(__dirname, './resources/js'),
35-
},
36-
},
3736
});

0 commit comments

Comments
 (0)