Merge branch '4.0-dev' of https://github.com/Leantime/leantime into 4…

….0-dev
Leantime · Jan 16, 2025 · 05b4445 · 05b4445
2 parents 000c1a3 + 1cf4ae7
commit 05b4445
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/Domain/Tickets/Js/ticketsController.js b/app/Domain/Tickets/Js/ticketsController.js
@@ -1050,7 +1050,7 @@ export const initTicketKanban = function (ticketStatusListParameter) {
 
         jQuery(currentElement).find(".contentInner").sortable({
             connectWith: ".contentInner",
-            items: "> .moveable",
+            items: "> .moveable-card",
             tolerance: 'intersect',
             placeholder: "ui-state-highlight",
             forcePlaceholderSize: true,

diff --git a/app/Domain/Tickets/Templates/components/cards/ticket-card.blade.php b/app/Domain/Tickets/Templates/components/cards/ticket-card.blade.php
@@ -24,7 +24,7 @@
 
 @else
 
-    <x-global::content.card>
+    <x-global::content.card class="moveable-card">
         <div class="flex">
             <div class="ticket-title leading-none">
                 @if($type !== 'kanban')

diff --git a/app/Views/Templates/components/content/card/index.blade.php b/app/Views/Templates/components/content/card/index.blade.php
@@ -29,13 +29,13 @@
 
 @switch($variation)
     @case('item')
-        <div class="card bg-base-100 card-compact shadow-md mb-2 border {{ $contentClass }}">
+        <div {{ $attributes->merge(['class' => 'card bg-base-100/90 card-compact shadow-md mb-2 border ' . $contentClass]) }}>
         @break
     @case('content')
-        <div class="card bg-base-100/90 mix-blend-luminosity card-compact shadow-lg mb-2 border {{ $contentClass }}">
+        <div {{ $attributes->merge(['class' => 'card bg-base-100/90 card-compact shadow-md mb-2 border ' . $contentClass]) }}>
         @break
     @case('widget')
-        <div class="card bg-base-100/90 card-compact shadow-md mb-2 border {{ $contentClass }}">
+        <div {{ $attributes->merge(['class' => 'card bg-base-100/90 card-compact shadow-md mb-2 border ' . $contentClass]) }}>
         @break
 @endswitch