From 9ca43814425554a73c1508f49e3ae0adda98fefc Mon Sep 17 00:00:00 2001 From: Rune Harlyk Date: Tue, 23 Apr 2024 21:40:34 +0200 Subject: [PATCH] Updates daisy ui --- app2/package.json | 2 +- app2/pnpm-lock.yaml | 8 ++++---- app2/postcss.config.js | 9 ++++----- app2/src/lib/DaisyUiHelper.ts | 2 +- app2/src/routes/system/metrics/SystemMetrics.svelte | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/app2/package.json b/app2/package.json index 050edbc..91edf1a 100644 --- a/app2/package.json +++ b/app2/package.json @@ -47,7 +47,7 @@ "dependencies": { "chart.js": "^4.4.2", "compare-versions": "^6.1.0", - "daisyui": "^4.9.0", + "daisyui": "^4.10.2", "jwt-decode": "^4.0.0", "nipplejs": "^0.10.1", "svelte-dnd-list": "^0.1.8", diff --git a/app2/pnpm-lock.yaml b/app2/pnpm-lock.yaml index 3b1d7ca..e765169 100644 --- a/app2/pnpm-lock.yaml +++ b/app2/pnpm-lock.yaml @@ -12,8 +12,8 @@ dependencies: specifier: ^6.1.0 version: 6.1.0 daisyui: - specifier: ^4.9.0 - version: 4.9.0(postcss@8.4.38) + specifier: ^4.10.2 + version: 4.10.2(postcss@8.4.38) jwt-decode: specifier: ^4.0.0 version: 4.0.0 @@ -1262,8 +1262,8 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dev: false - /daisyui@4.9.0(postcss@8.4.38): - resolution: {integrity: sha512-9JsDx4E+30kPxThE+6yEwQokqg1957uwTx/skP2RE98fG6Ten6U+S9YXeQg1a3CI958aF5aOb0oEA+KZFfrZUA==} + /daisyui@4.10.2(postcss@8.4.38): + resolution: {integrity: sha512-eCWS1W/JPyxW9IvlgW5m0R6rp9ZhRsBTW37rvEUthckkjsV04u8XipV519OoccSA46ixhSJa3q7XLI1WUFtRCA==} engines: {node: '>=16.9.0'} dependencies: css-selector-tokenizer: 0.8.0 diff --git a/app2/postcss.config.js b/app2/postcss.config.js index 2e7af2b..f6130aa 100644 --- a/app2/postcss.config.js +++ b/app2/postcss.config.js @@ -1,6 +1,5 @@ +import tailwindcss from 'tailwindcss'; +import autoprefixer from 'autoprefixer'; export default { - plugins: { - tailwindcss: {}, - autoprefixer: {}, - }, -} + plugins: [tailwindcss(), autoprefixer()] +}; diff --git a/app2/src/lib/DaisyUiHelper.ts b/app2/src/lib/DaisyUiHelper.ts index 273c855..44bea04 100644 --- a/app2/src/lib/DaisyUiHelper.ts +++ b/app2/src/lib/DaisyUiHelper.ts @@ -1,4 +1,4 @@ export function daisyColor(name: string, opacity: number = 100) { const color = getComputedStyle(document.documentElement).getPropertyValue(name); - return 'hsla(' + color + '/ ' + Math.min(Math.max(Math.round(opacity), 0), 100) + '%)'; + return `oklch(${color} / ${opacity}%)`; } diff --git a/app2/src/routes/system/metrics/SystemMetrics.svelte b/app2/src/routes/system/metrics/SystemMetrics.svelte index 8405519..5aef9ec 100644 --- a/app2/src/routes/system/metrics/SystemMetrics.svelte +++ b/app2/src/routes/system/metrics/SystemMetrics.svelte @@ -1,5 +1,5 @@