From 6549bc732ce017fe3e1cda579505d3eae6046bad Mon Sep 17 00:00:00 2001 From: Tom Atkins Date: Tue, 12 Mar 2024 15:12:30 +0000 Subject: [PATCH 1/2] Update daisyUI and Tailwind --- package-lock.json | 34 ++++++++++++++++++---------------- package.json | 6 +++--- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9a4b073e..684502cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,11 +16,11 @@ "devDependencies": { "@sveltejs/adapter-auto": "^2.0.0", "@sveltejs/kit": "^1.30.4", - "@tailwindcss/typography": "^0.5.9", + "@tailwindcss/typography": "^0.5.10", "@typescript-eslint/eslint-plugin": "^6.20.0", "@typescript-eslint/parser": "^6.19.0", "autoprefixer": "^10.4.15", - "daisyui": "^3.5.1", + "daisyui": "^4.7.3", "eslint": "^8.28.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-svelte": "^2.30.0", @@ -29,7 +29,7 @@ "prettier-plugin-svelte": "^3.0.3", "svelte": "^4.0.5", "svelte-check": "^3.4.3", - "tailwindcss": "^3.3.3", + "tailwindcss": "^3.4.1", "typescript": "^5.0.0", "vite": "^4.4.2", "vitest": "^0.34.0" @@ -1900,12 +1900,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/colord": { - "version": "2.9.3", - "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", - "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==", - "dev": true - }, "node_modules/commander": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", @@ -1977,17 +1971,25 @@ "node": ">=4" } }, + "node_modules/culori": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/culori/-/culori-3.3.0.tgz", + "integrity": "sha512-pHJg+jbuFsCjz9iclQBqyL3B2HLCBF71BwVNujUYEvCeQMvV97R59MNK3R2+jgJ3a1fcZgI9B3vYgz8lzr/BFQ==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, "node_modules/daisyui": { - "version": "3.9.4", - "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-3.9.4.tgz", - "integrity": "sha512-fvi2RGH4YV617/6DntOVGcOugOPym9jTGWW2XySb5ZpvdWO4L7bEG77VHirrnbRUEWvIEVXkBpxUz2KFj0rVnA==", + "version": "4.7.3", + "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.7.3.tgz", + "integrity": "sha512-R8jUpBMAUm4rSyxzGa9QqFdJTkzREtb1QahXdDoOfElGiF4VbSuu5bfqQoOro1kkSagPy+aTKu5WtSSXmH3u3g==", "dev": true, "dependencies": { - "colord": "^2.9", "css-selector-tokenizer": "^0.8", - "postcss": "^8", - "postcss-js": "^4", - "tailwindcss": "^3.1" + "culori": "^3", + "picocolors": "^1", + "postcss-js": "^4" }, "engines": { "node": ">=16.9.0" diff --git a/package.json b/package.json index 93790a3c..4a0e702e 100644 --- a/package.json +++ b/package.json @@ -17,11 +17,11 @@ "devDependencies": { "@sveltejs/adapter-auto": "^2.0.0", "@sveltejs/kit": "^1.30.4", - "@tailwindcss/typography": "^0.5.9", + "@tailwindcss/typography": "^0.5.10", "@typescript-eslint/eslint-plugin": "^6.20.0", "@typescript-eslint/parser": "^6.19.0", "autoprefixer": "^10.4.15", - "daisyui": "^3.5.1", + "daisyui": "^4.7.3", "eslint": "^8.28.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-svelte": "^2.30.0", @@ -30,7 +30,7 @@ "prettier-plugin-svelte": "^3.0.3", "svelte": "^4.0.5", "svelte-check": "^3.4.3", - "tailwindcss": "^3.3.3", + "tailwindcss": "^3.4.1", "typescript": "^5.0.0", "vite": "^4.4.2", "vitest": "^0.34.0" From 47b8a23670e7fe63b8d8e867aa295a0f9d53ce12 Mon Sep 17 00:00:00 2001 From: Tom Atkins Date: Tue, 12 Mar 2024 15:12:51 +0000 Subject: [PATCH 2/2] Updates for daisyUI 4 https://github.com/saadeghi/daisyui/discussions/2507 --- src/app.css | 2 +- src/routes/(marketing)/login/login_config.ts | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app.css b/src/app.css index 7c846301..09168d6d 100644 --- a/src/app.css +++ b/src/app.css @@ -17,5 +17,5 @@ button[disabled].authBtn { button[disabled].authBtn::before { font-size: 14px; content: "Loading..."; - color: hsl(var(--pc)); + color: oklch(var(--pc)); } diff --git a/src/routes/(marketing)/login/login_config.ts b/src/routes/(marketing)/login/login_config.ts index 2cdbcb4f..93284181 100644 --- a/src/routes/(marketing)/login/login_config.ts +++ b/src/routes/(marketing)/login/login_config.ts @@ -9,15 +9,15 @@ export const sharedAppearance = { variables: { default: { colors: { - brand: "hsl(var(--p))", - brandAccent: "hsl(var(--pf))", - inputText: "hsl(var(--n))", - brandButtonText: "hsl(var(--pc))", - messageText: "hsl(var(--b))", - dividerBackground: "hsl(var(--n))", - inputLabelText: "hsl(var(--n))", - defaultButtonText: "hsl(var(--n))", - anchorTextColor: "hsl(var(--nc))", + brand: "oklch(var(--p))", + brandAccent: "oklch(var(--pf))", + inputText: "oklch(var(--n))", + brandButtonText: "oklch(var(--pc))", + messageText: "oklch(var(--b))", + dividerBackground: "oklch(var(--n))", + inputLabelText: "oklch(var(--n))", + defaultButtonText: "oklch(var(--n))", + anchorTextColor: "oklch(var(--nc))", }, fontSizes: { baseInputSize: "16px",