Migrate to daisyui 4

dtcooper · Nov 13, 2023 · bf6083d · bf6083d
1 parent b51b731
commit bf6083d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 37 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -43,7 +43,7 @@
     "axios": "^1.6.1",
     "browser-sync": "^2.29.3",
     "color": "^4.2.3",
-    "daisyui": "^3.9.4",
+    "daisyui": "^4.0.3",
     "dayjs": "^1.11.10",
     "download": "^8.0.0",
     "electron": "^27.0.4",

diff --git a/client/src/App.svelte b/client/src/App.svelte
@@ -31,15 +31,6 @@
     .btn {
       @apply no-animation;
     }
-    .btn-warning:hover,
-    .btn-info:hover,
-    .btn-success:hover,
-    .btn-error:hover {
-      filter: brightness(110%);
-    }
-    .btn:active {
-      filter: brightness(97%);
-    }
   }
 
   :root {
@@ -50,10 +41,6 @@
     @apply h-16 w-16;
   }
 
-  :root {
-    --btn-text-case: normal;
-  }
-
   :global(.tomato-pulse) {
     animation: tomato-pulse 1.5s infinite;
     --pulse-color: var(--su);
@@ -62,15 +49,15 @@
 
   @keyframes tomato-pulse {
     0% {
-      box-shadow: 0 0 0 0 hsl(var(--pulse-color) / 0.85);
+      box-shadow: 0 0 0 0 oklch(var(--pulse-color) / 0.85);
     }
 
     85% {
-      box-shadow: 0 0 0 var(--pulse-size) hsl(var(--pulse-color) / 0);
+      box-shadow: 0 0 0 var(--pulse-size) oklch(var(--pulse-color) / 0);
     }
 
     100% {
-      box-shadow: 0 0 0 0 hsl(var(--pulse-color) / 0);
+      box-shadow: 0 0 0 0 oklch(var(--pulse-color) / 0);
     }
   }
 
@@ -84,7 +71,7 @@
       background-color: unset;
     }
     50% {
-      background-color: hsl(var(--flash-bg-color));
+      background-color: oklch(var(--flash-bg-color));
     }
     100% {
       background-color: unset;

diff --git a/client/src/main/player/List.svelte b/client/src/main/player/List.svelte
@@ -55,7 +55,7 @@
                 <div
                   class="flex min-h-[5rem] items-center gap-3 overflow-hidden px-3 py-1"
                   style={asset.playable && !asset.error && !asset.finished
-                    ? `background: linear-gradient(to right, hsl(var(--sf)) 0%, hsl(var(--sf)) ${asset.percentDone}%, hsl(var(--s)) ${asset.percentDone}%, hsl(var(--s)) 100%);`
+                    ? `background: linear-gradient(to right, color-mix(in oklab, oklch(var(--s)) 80%, black) 0%, color-mix(in oklab, oklch(var(--s)) 80%, black) ${asset.percentDone}%, oklch(var(--s)) ${asset.percentDone}%, oklch(var(--s)) 100%);`
                     : ""}
                   class:text-secondary-content={asset.playable && !asset.error && !asset.finished}
                   class:text-error-content={asset.error && !asset.finished}
@@ -172,7 +172,7 @@
           <div class="border-l-4 pl-2" class:border-base-content={!isFirstItem} class:border-success={isFirstItem}>
             <div
               class="flex min-h-[5rem] items-center gap-3 overflow-hidden px-3 py-1 text-neutral-content"
-              style:background-image={`linear-gradient(to right, hsl(var(--nf)) 0%, hsl(var(--nf)) ${item.percentDone}%, hsl(var(--n)) ${item.percentDone}%, hsl(var(--n)) 100%)`}
+              style:background-image={`linear-gradient(to right, color-mix(in oklab, oklch(var(--n)) 80%, black) 0%, color-mix(in oklab, oklch(var(--n)) 80%, black) ${item.percentDone}%, oklch(var(--n)) ${item.percentDone}%, oklch(var(--n)) 100%)`}
             >
               {#if $userConfig.uiMode >= 2}
                 <div class="flex items-center">

diff --git a/server/api/app.py b/server/api/app.py
@@ -54,9 +54,7 @@ async def api(websocket: WebSocket):
         await websocket.close()
 
     except WebSocketDisconnect:
-        print("DISCONNECT....")
-        print(users.connections)
-        print(admins.connections)
+        pass
 
     else:
         await websocket.close()