From ed1dc91bd796ca4390a01d00eadd61c52f359cc5 Mon Sep 17 00:00:00 2001 From: Timothy Pidashev Date: Sun, 17 Mar 2024 19:48:53 -0700 Subject: [PATCH] Actually works! --- .gitignore | 2 +- src/web/package-lock.json | 6 +-- src/web/package.json | 6 +-- src/web/src/app/globals.css | 6 +-- src/web/src/app/layout.js | 6 +-- src/web/src/components/header.jsx | 2 +- src/web/src/styles/tailwind.css | 3 -- src/web/tailwind.config.js | 70 +------------------------------ 8 files changed, 16 insertions(+), 85 deletions(-) delete mode 100644 src/web/src/styles/tailwind.css diff --git a/.gitignore b/.gitignore index 90f05df..6678019 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,7 @@ node_modules/ /coverage # next.js -/.next/ +.next/ /out/ # production diff --git a/src/web/package-lock.json b/src/web/package-lock.json index 0c1a9ef..5cd9ccc 100644 --- a/src/web/package-lock.json +++ b/src/web/package-lock.json @@ -15,11 +15,11 @@ "react-icons": "^5.0.1" }, "devDependencies": { - "autoprefixer": "^10.0.1", + "autoprefixer": "^10.4.18", "eslint": "^8", "eslint-config-next": "14.1.3", - "postcss": "^8", - "tailwindcss": "^3.3.0" + "postcss": "^8.4.36", + "tailwindcss": "^3.4.1" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/src/web/package.json b/src/web/package.json index a0f5974..a9e4f8e 100644 --- a/src/web/package.json +++ b/src/web/package.json @@ -16,10 +16,10 @@ "react-icons": "^5.0.1" }, "devDependencies": { - "autoprefixer": "^10.0.1", + "autoprefixer": "^10.4.18", "eslint": "^8", "eslint-config-next": "14.1.3", - "postcss": "^8", - "tailwindcss": "^3.3.0" + "postcss": "^8.4.36", + "tailwindcss": "^3.4.1" } } diff --git a/src/web/src/app/globals.css b/src/web/src/app/globals.css index a31e444..76fcadc 100644 --- a/src/web/src/app/globals.css +++ b/src/web/src/app/globals.css @@ -1,3 +1,3 @@ -@import 'tailwindcss/base'; -@import 'tailwindcss/components'; -@import 'tailwindcss/utilities'; +@import "tailwindcss/base"; +@import "tailwindcss/components"; +@import "tailwindcss/utilities"; diff --git a/src/web/src/app/layout.js b/src/web/src/app/layout.js index a99d2b5..1eb7c06 100644 --- a/src/web/src/app/layout.js +++ b/src/web/src/app/layout.js @@ -1,5 +1,5 @@ // Imports -import "@/styles/tailwind.css"; +import "@/app/globals.css"; import Theme from "@/app/theme"; import Header from "@/components/header"; import Footer from "@/components/footer"; @@ -14,10 +14,10 @@ export const metadata = { export default function Layout({children}) { return ( - +
-
+
{children}