From a450530c749bffa8de8711681ccc50c00344d361 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Thu, 28 Mar 2024 11:44:55 -0700
Subject: [PATCH 1/3] fixes z-index of table load

---
 resources/assets/less/overrides.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index f651826dd..72b8437eb 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -358,6 +358,10 @@ body {
   white-space: normal;
 }
 
+.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
+  z-index: 840 !important;
+}
+
 @media print {
   a[href]:after {
     content: none;

From 79c5697042c3352899ab3631c730796f14c3dd57 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 3 Apr 2024 13:06:49 +0100
Subject: [PATCH 2/3] Fixed dev - take 2!

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/hardware/view.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 461f2a468..15ccf856e 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -32,8 +32,6 @@
         <div class="col-md-12">
 
 
-
-
             <!-- Custom Tabs -->
             <div class="nav-tabs-custom">
                 <ul class="nav nav-tabs">
@@ -140,6 +138,7 @@
                 </ul>
 
                 <div class="tab-content">
+
                     <div class="tab-pane fade in active" id="details">
                         <div class="row">
                             <div class="col-md-8">
@@ -926,6 +925,7 @@
                                                     <button class="btn btn-sm btn-warning col-md-12">{{ trans('general.restore') }}</button>
                                                 </form>
                                            @endif
+                                        </div>
                                     @endcan
 
                                 @if (($asset->assignedTo) && ($asset->deleted_at==''))
@@ -995,7 +995,7 @@
                             </div> <!-- div.col-md-4 -->
                         </div><!-- /row -->
                     </div><!-- /.tab-pane asset details -->
-                    </div>
+                 
 
                     <div class="tab-pane fade" id="software">
                         <div class="row">

From df95447ea43595d158e67a0294bf4f8dc43d5831 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 3 Apr 2024 13:08:08 +0100
Subject: [PATCH 3/3] New dev assets

Signed-off-by: snipe <snipe@snipe.net>
---
 public/css/build/app.css       | 3 +++
 public/css/build/overrides.css | 3 +++
 public/css/dist/all.css        | 6 ++++++
 public/mix-manifest.json       | 6 +++---
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/public/css/build/app.css b/public/css/build/app.css
index f6e9fd680..9ba05108f 100644
--- a/public/css/build/app.css
+++ b/public/css/build/app.css
@@ -697,6 +697,9 @@ body {
   font-size: 14px;
   white-space: normal;
 }
+.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
+  z-index: 840 !important;
+}
 @media print {
   a[href]:after {
     content: none;
diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css
index f32d3051d..52928e416 100644
--- a/public/css/build/overrides.css
+++ b/public/css/build/overrides.css
@@ -330,6 +330,9 @@ body {
   font-size: 14px;
   white-space: normal;
 }
+.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
+  z-index: 840 !important;
+}
 @media print {
   a[href]:after {
     content: none;
diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index 9d7cd1b40..d70874aad 100644
--- a/public/css/dist/all.css
+++ b/public/css/dist/all.css
@@ -22197,6 +22197,9 @@ body {
   font-size: 14px;
   white-space: normal;
 }
+.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
+  z-index: 840 !important;
+}
 @media print {
   a[href]:after {
     content: none;
@@ -23461,6 +23464,9 @@ body {
   font-size: 14px;
   white-space: normal;
 }
+.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
+  z-index: 840 !important;
+}
 @media print {
   a[href]:after {
     content: none;
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 68309ab7e..b46742288 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,8 +1,8 @@
 {
     "/js/build/app.js": "/js/build/app.js?id=ea5f3edebafdb29b616d23fa89106080",
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=742bf17cd1ed6feaa90756beeb09d749",
-    "/css/build/app.css": "/css/build/app.css?id=1e755f4e7a6968ee5d46747a4ffeca47",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=ba34afc5bd6ee746744fd109672f715e",
+    "/css/build/app.css": "/css/build/app.css?id=1b976575001241a8f97ec4fad7bd1f3d",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2",
     "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=e6e53eef152bba01a4c666a4d8b01117",
@@ -18,7 +18,7 @@
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da",
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898",
-    "/css/dist/all.css": "/css/dist/all.css?id=205f918653b20e1eb25f5c322b7a6832",
+    "/css/dist/all.css": "/css/dist/all.css?id=53cc9f0f60753c049f4e49617d21c0fe",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=69e5d8e4e818f05fd882cceb758d1eba",