Merge pull request #1419 from DissNik/3.x_style-refactoring

style refactoring
moonshine-software · Dec 23, 2024 · 4242c7c · 4242c7c
2 parents 894412a + 9095d90
commit 4242c7c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 32 deletions.
diff --git a/src/UI/package-lock.json b/src/UI/package-lock.json
diff --git a/src/UI/package.json b/src/UI/package.json
@@ -33,7 +33,6 @@
         "@popperjs/core": "^2.11",
         "alpinejs": "^3.13",
         "choices.js": "^10.2",
-        "codeflask": "^1.4",
         "sortablejs": "^1.15",
         "tippy.js": "^6.3"
     }

diff --git a/src/UI/resources/css/minimalistic.css b/src/UI/resources/css/minimalistic.css
@@ -129,7 +129,7 @@ body.theme-minimalistic {
       }
 
       &-dropdown {
-        @apply mb-1 mt-1 border border-solid border-dark-200 bg-dark-50 pb-0 dark:bg-dark-700;
+        @apply mb-1 mt-1 border border-solid border-dark-200 bg-dark-50 dark:bg-dark-700;
 
         .menu-inner-divider {
           @apply before:bg-dark-200;

diff --git a/src/UI/resources/views/components/link-native.blade.php b/src/UI/resources/views/components/link-native.blade.php
@@ -3,7 +3,7 @@
     'filled' => false,
     'badge' => false,
 ])
-<a {{ $attributes->class(['inline-flex items-center gap-1 text-2xs hover:text-primary', 'text-primary' => $filled]) }}>
+<a {{ $attributes->class(['flex items-center gap-1 hover:text-primary', 'text-primary' => $filled]) }}>
     {{ $icon ?? '' }}
     {{ $slot ?? '' }}
     @if($badge !== false)

diff --git a/src/UI/src/Components/Table/TableBuilder.php b/src/UI/src/Components/Table/TableBuilder.php
@@ -451,11 +451,15 @@ private function resolveHeadRow(): TableRowContract
                         $field->getSortQuery($this->getAsyncUrl()),
                         $field->getLabel(),
                     )
-                        ->icon(
-                            $field->isSortActive() && $field->sortDirectionIs('desc') ? 'bars-arrow-down'
-                                : 'bars-arrow-up',
+                        ->when(
+                            $field->isSortActive(),
+                            static fn (Link $link) =>$link->icon(
+                                $field->sortDirectionIs('desc') ? 'bars-arrow-down' : 'bars-arrow-up',
+                            ),
+                            static fn (Link $link) =>$link->icon('arrows-up-down'),
                         )
                         ->customAttributes([
+                            'class' => $field->isSortActive() ? 'text-primary' : '',
                             '@click.prevent' => $this->isAsync() ? 'asyncRequest' : null,
                         ])
                     : $field->getLabel();