Skip to content

Commit 4e62857

Browse files
committed
fix: tailwind and shadcn theme working
1 parent 60b55db commit 4e62857

File tree

3 files changed

+4
-54
lines changed

3 files changed

+4
-54
lines changed

resources/js/pages/welcome.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Button } from '@/components/ui/button';
22
import { Head, Link } from '@inertiajs/react'
33

4-
54
export default function Welcome() {
65
return (
76
<>
@@ -18,7 +17,7 @@ export default function Welcome() {
1817
<Button variant="ghost" asChild>
1918
<Link href="#">Log in</Link>
2019
</Button>
21-
<Button variant="outline" asChild>
20+
<Button variant="default" asChild>
2221
<Link href="#">Register</Link>
2322
</Button>
2423
</nav>

resources/views/inertia_layout.edge

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -12,59 +12,10 @@
1212
<link rel="preconnect" href="https://fonts.bunny.net" />
1313
<link href="https://fonts.bunny.net/css?family=figtree:400,500,600&display=swap" rel="stylesheet" />
1414

15-
<style>
16-
:root {
17-
--sand-1: #fdfdfc;
18-
--sand-2: #f9f9f8;
19-
--sand-3: #f1f0ef;
20-
--sand-4: #e9e8e6;
21-
--sand-5: #e2e1de;
22-
--sand-6: #dad9d6;
23-
--sand-7: #cfceca;
24-
--sand-8: #bcbbb5;
25-
--sand-9: #8d8d86;
26-
--sand-10: #82827c;
27-
--sand-11: #63635e;
28-
--sand-12: #21201c;
29-
}
30-
</style>
31-
32-
<script src="https://cdn.tailwindcss.com">
33-
34-
</script>
35-
36-
<script>
37-
tailwind.config = {
38-
theme: {
39-
extend: {
40-
fontFamily: {
41-
sans: [ "Instrument Sans", "sans-serif" ]
42-
},
43-
colors: {
44-
sand: {
45-
1: "var(--sand-1)",
46-
2: "var(--sand-2)",
47-
3: "var(--sand-3)",
48-
4: "var(--sand-4)",
49-
5: "var(--sand-5)",
50-
6: "var(--sand-6)",
51-
7: "var(--sand-7)",
52-
8: "var(--sand-8)",
53-
9: "v and import it herear(--sand-9)",
54-
10: "var(--sand-10)",
55-
11: "var(--sand-11)",
56-
12: "var(--sand-12)"
57-
}
58-
}
59-
}
60-
}
61-
};
62-
</script>
63-
6415
@stack('dumper')
6516
@viteReactRefresh()
6617
@inertiaHead()
67-
@vite(['resources/js/app/app.tsx', `resources/js/pages/${page.component}.tsx`])
18+
@vite(['resources/css/app.css', 'resources/js/app/app.tsx', `resources/js/pages/${page.component}.tsx`])
6819
</head>
6920

7021
<body class="min-h-screen w-screen font-sans">

tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
/* Modules */
3232
"module": "ESNext" /* Specify what module code is generated. */,
33-
// "rootDir": "./", /* Specify the root folder within your source files. */
33+
"rootDir": "./", /* Specify the root folder within your source files. */
3434
"moduleResolution": "Bundler" /* Specify how TypeScript looks up a file from a given module specifier. */,
3535
"baseUrl": ".",
3636
"paths": {
@@ -107,7 +107,7 @@
107107
"noImplicitReturns": true /* Enable error reporting for codepaths that do not explicitly return in a function. */,
108108
"noFallthroughCasesInSwitch": true /* Enable error reporting for fallthrough cases in switch statements. */,
109109
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
110-
"noImplicitOverride": true /* Ensure overriding members in derived classes are marked with an override modifier. */,
110+
"noImplicitOverride": false /* Ensure overriding members in derived classes are marked with an override modifier. */,
111111
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
112112
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
113113
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */

0 commit comments

Comments
 (0)