Updated production assets

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json

app/Http/Controllers/Components/ComponentCheckoutController.php

@@ -64,8 +64,8 @@ class ComponentCheckoutController extends Controller
 
         $max_to_checkout = $component->numRemaining();
 
-        // Make sure there is at least one available to checkout
-        if ($max_to_checkout <= $request->get('assigned_qty')) {
+        // Make sure there are at least the requested number of components available to checkout
+        if ($max_to_checkout < $request->get('assigned_qty')) {
             return redirect()->back()->withInput()->with('error', trans('admin/components/message.checkout.unavailable', ['remaining' => $max_to_checkout, 'requested' => $request->get('assigned_qty')]));
         }
 

public/mix-manifest.json

@@ -1,24 +1,24 @@
 {
     "/js/build/app.js": "/js/build/app.js?id=59ddb05ca277a4e3a8b8cf3c2f5c01b8",
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=392cc93cfc0be0349bab9697669dd091",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=0f8376a8d39550aeee63a29445d177c1",
-    "/css/build/app.css": "/css/build/app.css?id=0b476eb0ac88a657b91bc5bfb7ab0534",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=fc5c8fc567eafec1ffaf0ae59a80a489",
+    "/css/build/app.css": "/css/build/app.css?id=7a73f7eb46240bc9ff8a1951f4d42e4a",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=f25c77ed07053646a42e9c19923d24fa",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=268041e902b019730c23ee3875838005",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=c3aebf96518113fe22517a67c6ec1dc1",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=bf6f6c2270110b3b29f2f3af7e07636d",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=b23ea958779a62474f398ffab9da7ba1",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=391a35bad1c8a2bfba09674326afc83d",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=d870f5bb475cbd4b911f37a1399865fc",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=ab27bbab55867689496facc26952f036",
     "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=fc7adb943668ac69fe4b646625a7571f",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=5f7e5307fa12a54195d2000b5b5b5076",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=9f944e8021781af1ce45d27765d1c0c2",
     "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=cf6c8c340420724b02d6e787ef9bded5",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=0f4baf95eb4bb23cf837007e61cb666e",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=067d7b5d630f23d68ea3b1122527cb04",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=4eb9b933cfcd7eb021c52f401a8947a1",
+    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=9d82328db1567e5af69ff4e1935e720e",
     "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=1f33ca3d860461c1127ec465ab3ebb6b",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=8f449de09e00c15481b144b44b1a7185",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=15eb3805c9016a4ec8171a69d2830d51",
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=b48f4d8af0e1ca5621c161e93951109f",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=f0fbbb0ac729ea092578fb05ca615460",
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=b9a74ec0cd68f83e7480d5ae39919beb",
-    "/css/dist/all.css": "/css/dist/all.css?id=049fec0b3a6c1df9e605b5cb433e5e53",
+    "/css/dist/all.css": "/css/dist/all.css?id=06f08e03169ffa22e079e47d5681a471",
     "/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=2df05d4beaa48550d71234e8dca79141",
@@ -34,18 +34,18 @@
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=7a506bf59323cf5b5fe97f7080fc5ee0",
     "/js/dist/all.js": "/js/dist/all.js?id=abb8cd9afe481e321ed279c6a2dfed3d",
     "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=b48f4d8af0e1ca5621c161e93951109f",
-    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=8f449de09e00c15481b144b44b1a7185",
+    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=15eb3805c9016a4ec8171a69d2830d51",
     "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=1f33ca3d860461c1127ec465ab3ebb6b",
-    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=067d7b5d630f23d68ea3b1122527cb04",
+    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=9d82328db1567e5af69ff4e1935e720e",
     "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=392cc93cfc0be0349bab9697669dd091",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=bf6f6c2270110b3b29f2f3af7e07636d",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=d870f5bb475cbd4b911f37a1399865fc",
     "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=fc7adb943668ac69fe4b646625a7571f",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=b23ea958779a62474f398ffab9da7ba1",
+    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=ab27bbab55867689496facc26952f036",
     "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=b9a74ec0cd68f83e7480d5ae39919beb",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=0f4baf95eb4bb23cf837007e61cb666e",
+    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=4eb9b933cfcd7eb021c52f401a8947a1",
     "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=cf6c8c340420724b02d6e787ef9bded5",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=5f7e5307fa12a54195d2000b5b5b5076",
+    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=9f944e8021781af1ce45d27765d1c0c2",
     "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=268041e902b019730c23ee3875838005",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=c3aebf96518113fe22517a67c6ec1dc1",
+    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=391a35bad1c8a2bfba09674326afc83d",
     "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=f0fbbb0ac729ea092578fb05ca615460"
 }

resources/assets/less/overrides.less

@@ -141,6 +141,9 @@ a.accordion-header {
 .dropdown-menu li a {
   //color: inherit;
 }
+.pull-text-right{
+  text-align: right !important;
+}
 
 .main-header .sidebar-toggle:before {
   content: "\f0c9";

resources/assets/less/skins/skin-black-dark.less

@@ -135,6 +135,18 @@ a {
 #ldapad_test_results.well.well-sm{
   color: var(--back-main);
 }
+//pagination
+.pagination > li >a{
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--visited-link);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover{
+  background-color: var(--hover-link);
+}
 
 .main-header .navbar, .main-header .logo {
   background-color: var(--header);

resources/assets/less/skins/skin-blue-dark.less

@@ -132,6 +132,32 @@ a {
 #ldapad_test_results.well.well-sm{
   color: var(--back-main);
 }
+//pagination
+.pagination > li >a{
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--visited-link);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover{
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu{
+  background-color: var(--back-main);
+}
+
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress{
+  background-color: var(--background);
+}
+h2.task_menu{
+  color:var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu{
+  background-color:var(--back-main);
+  color:var(--link);
+}
 
 .main-header .navbar, .main-header .logo {
   background-color: var(--header);

resources/assets/less/skins/skin-green-dark.less

@@ -131,6 +131,32 @@ a {
 #ldapad_test_results.well.well-sm{
   color: var(--back-main);
 }
+//pagination
+.pagination > li >a{
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--visited-link);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover{
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu{
+  background-color: var(--back-main);
+}
+
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress{
+  background-color: var(--background);
+}
+h2.task_menu{
+  color:var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu{
+  background-color:var(--back-main);
+  color:var(--link);
+}
 
 .main-header .navbar, .main-header .logo {
   background-color: var(--header);
@@ -288,10 +314,6 @@ input[type=text], input[type=search] {
 .nav-tabs-custom, .nav-tabs-custom>.tab-content {
   background-color: var(--back-main);
 }
-.navbar-nav>.tasks-menu>.dropdown-menu>li.header {
-  background-color: var(--back-main);
-  color: var(--header);
-}
 .open>.dropdown-toggle.btn-default {
   background-color: var(--back-sub);
   color: var(--header);
@@ -327,7 +349,7 @@ input[type=text], input[type=search] {
   color: var(--text-main);
 }
 .skin-green-dark .main-header .navbar .dropdown-menu li a {
-  color: var(--header);
+  color: var(--link);
 }
 .fixed-table-body thead th .th-inner, .skin-green-dark .sidebar-menu>li.active>a, .skin-green .sidebar-menu>li:hover>a, .sidebar-toggle:hover {
   background-color: var(--header)!important;

resources/assets/less/skins/skin-orange-dark.less

@@ -119,6 +119,32 @@ li.dropdown-item-marker {
 #ldapad_test_results.well.well-sm{
   color: var(--back-main);
 }
+//pagination
+.pagination > li >a{
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--visited-link);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover{
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu{
+  background-color: var(--back-main);
+}
+
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress{
+  background-color: var(--background);
+}
+h2.task_menu{
+  color:var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu{
+  background-color:var(--back-main);
+  color:var(--link);
+}
 
 .main-header .navbar, .main-header .logo {
   background-color: var(--header);

resources/assets/less/skins/skin-purple-dark.less

@@ -132,6 +132,32 @@ a {
 #ldapad_test_results.well.well-sm{
   color: var(--back-main);
 }
+//pagination
+.pagination > li >a{
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--button-default);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover{
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu{
+  background-color: var(--back-main);
+}
+
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress{
+  background-color: var(--background);
+}
+h2.task_menu{
+  color:var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu{
+  background-color:var(--back-main);
+  color:var(--link);
+}
 
 .main-header .navbar, .main-header .logo {
   background-color: var(--header);
@@ -299,7 +325,7 @@ input[type=text], input[type=search] {
 }
 .navbar-nav>.tasks-menu>.dropdown-menu>li.header {
   background-color: var(--back-main);
-  color: var(--header);
+  color: var(--link);
 }
 .open>.dropdown-toggle.btn-default {
   background-color: var(--back-sub);

resources/assets/less/skins/skin-red-dark.less

@@ -134,7 +134,32 @@ a {
 #ldapad_test_results.well.well-sm{
   color: var(--back-main);
 }
+//pagination
+.pagination > li >a{
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--visited-link);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover{
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu{
+  background-color: var(--back-main);
+}
 
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress{
+  background-color: var(--background);
+}
+h2.task_menu{
+  color:var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu{
+  background-color:var(--back-main);
+  color:var(--link);
+}
 .main-header .navbar, .main-header .logo {
   background-color: var(--header);
   background: -webkit-linear-gradient(top,  var(--header) 0%,var(--header) 100%);
@@ -209,7 +234,6 @@ body {
 }
 .btn-default{
   background-color: var(--back-sub);
-  color: var(--link);
 }
 
 .btn-default dropdown-toggle {

resources/assets/less/skins/skin-yellow-dark.less

@@ -125,7 +125,33 @@ a {
 #ldapad_test_results.well.well-sm{
   color: var(--back-main);
 }
+//pagination
+.pagination > li >a{
+  color: var(--text-main);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--button-default);
+  border-color: var(--light-link);
+  color:var(--nav-link);
+}
+.pagination > .active > a:hover{
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu{
+  background-color: var(--back-main);
+}
 
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress{
+  background-color: var(--background);
+}
+h2.task_menu{
+  color:var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu{
+  background-color:var(--back-main);
+  color:var(--link);
+}
 .main-header .navbar, .main-header .logo {
   background-color: var(--header);
   background: -webkit-linear-gradient(top,  var(--header) 0%,var(--header) 100%);

resources/views/layouts/default.blade.php

@@ -850,10 +850,12 @@
                 </section>
 
             </div><!-- /.content-wrapper -->
-
-            <footer class="main-footer hidden-print">
-
-                <div class="pull-right hidden-xs">
+            @if ($snipeSettings->footer_text!='')
+                <footer class="main-footer hidden-print" style="display:grid;flex-direction:row;" >
+            @else
+                <footer class="main-footer hidden-print">
+            @endif
+                <div class="pull-text-right hidden-xs">
                     @if ($snipeSettings->version_footer!='off')
                         @if (($snipeSettings->version_footer=='on') || (($snipeSettings->version_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
                             &nbsp; <strong>Version</strong> {{ config('version.app_version') }} -
@@ -874,21 +876,20 @@
                     @if ($snipeSettings->privacy_policy_link!='')
                         <a target="_blank" class="btn btn-default btn-xs" rel="noopener"
                            href="{{  $snipeSettings->privacy_policy_link }}"
-                           target="_new">{{ trans('admin/settings/general.privacy_policy') }}</a>
+                           target="_new" >{{ trans('admin/settings/general.privacy_policy') }}</a>
                     @endif
-
-
+                made with <i class="fas fa-heart" style="color: #a94442; font-size: 10px" aria-hidden="true"></i><span
+                        class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>.
                 </div>
+                <div class="pull-text-right"><a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software,</div>
                 @if ($snipeSettings->footer_text!='')
-                    <div class="pull-right">
+                    <div  style="flex-direction: row;">
                         {!!  Helper::parseEscapedMarkedown($snipeSettings->footer_text)  !!}
                     </div>
                 @endif
+                    <br>
 
 
-                <a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software,
-                made with <i class="fas fa-heart" style="color: #a94442; font-size: 10px" aria-hidden="true"></i><span
-                        class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>.
             </footer>