lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2021-02-02 01:59:13 -08:00
commit de9f487664
5 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/SettingsController.php
View file

@ -1158,6 +1158,8 @@ class SettingsController extends Controller
{ {
if (! config('app.lock_passwords')) { if (! config('app.lock_passwords')) {
if ('DELETE' == $request->input('confirm_purge')) { if ('DELETE' == $request->input('confirm_purge')) {
\Log::warning('User ID '.Auth::user()->id.' initiated a PURGE!');
// Run a backup immediately before processing // Run a backup immediately before processing
Artisan::call('backup:run'); Artisan::call('backup:run');
Artisan::call('snipeit:purge', ['--force' => 'true', '--no-interaction' => true]); Artisan::call('snipeit:purge', ['--force' => 'true', '--no-interaction' => true]);

10
public/css/dist/skins/skin-black-dark.css vendored
View file

@ -205,7 +205,7 @@ a,
a:link, a:link,
a:visited, a:visited,
.btn-primary.hover { .btn-primary.hover {
color: var(--header); color: var(--text-main);
} }
#accessoriesTable > tbody > tr > td > nobr > a > i.fa { #accessoriesTable > tbody > tr > td > nobr > a > i.fa {
color: var(--text-main); color: var(--text-main);
@ -228,11 +228,11 @@ body {
.box-footer, .box-footer,
.box-header { .box-header {
background-color: var(--back-sub); background-color: var(--back-sub);
color: var(--header); color: var(--text-main);
} }
.btn-default { .btn-default {
background-color: var(--back-main); background-color: var(--back-main);
color: var(--header); color: var(--text-main);
} }
.btn-default:active, .btn-default:active,
.btn-default:focus, .btn-default:focus,
@ -408,13 +408,13 @@ a {
color: var(--link); color: var(--link);
} }
a:link { a:link {
color: var(--header); color: var(--text-main);
} }
a:hover { a:hover {
color: var(--light-link); color: var(--light-link);
} }
a:visited { a:visited {
color: var(--header); color: var(--text-sub);
} }
.row-striped { .row-striped {
vertical-align: top; vertical-align: top;

10
public/css/dist/skins/skin-black-dark.min.css vendored
View file

@ -205,7 +205,7 @@ a,
a:link, a:link,
a:visited, a:visited,
.btn-primary.hover { .btn-primary.hover {
color: var(--header); color: var(--text-main);
} }
#accessoriesTable > tbody > tr > td > nobr > a > i.fa { #accessoriesTable > tbody > tr > td > nobr > a > i.fa {
color: var(--text-main); color: var(--text-main);
@ -228,11 +228,11 @@ body {
.box-footer, .box-footer,
.box-header { .box-header {
background-color: var(--back-sub); background-color: var(--back-sub);
color: var(--header); color: var(--text-main);
} }
.btn-default { .btn-default {
background-color: var(--back-main); background-color: var(--back-main);
color: var(--header); color: var(--text-main);
} }
.btn-default:active, .btn-default:active,
.btn-default:focus, .btn-default:focus,
@ -408,13 +408,13 @@ a {
color: var(--link); color: var(--link);
} }
a:link { a:link {
color: var(--header); color: var(--text-main);
} }
a:hover { a:hover {
color: var(--light-link); color: var(--light-link);
} }
a:visited { a:visited {
color: var(--header); color: var(--text-sub);
} }
.row-striped { .row-striped {
vertical-align: top; vertical-align: top;

4
public/mix-manifest.json
View file

@ -9,7 +9,7 @@
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=77ce26763889742cbb58", "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=77ce26763889742cbb58",
"/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=26495da663d45d22a6a3", "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=26495da663d45d22a6a3",
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=87b54289d2c1370974d1", "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=87b54289d2c1370974d1",
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=e236b946c22e46b3e140", "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=789c0a0fb854092dcfb7",
"/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=a0354af13a9e5f1fd9e4", "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=a0354af13a9e5f1fd9e4",
"/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=3e904c2867143e27aebf", "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=3e904c2867143e27aebf",
"/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=491f44eecee65bbd8c4a", "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=491f44eecee65bbd8c4a",
@ -22,7 +22,7 @@
"/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a", "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
"/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac", "/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac",
"/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=26495da663d45d22a6a3", "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=26495da663d45d22a6a3",
"/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=e236b946c22e46b3e140", "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=789c0a0fb854092dcfb7",
"/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=f53016b009b4adab0ac0", "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=f53016b009b4adab0ac0",
"/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=c6961dc48135f991c756", "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=c6961dc48135f991c756",
"/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=a0354af13a9e5f1fd9e4", "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=a0354af13a9e5f1fd9e4",

10
resources/assets/less/skins/skin-black-dark.less
View file

@ -139,7 +139,7 @@ a {
} }
a, a:link, a:visited, .btn-primary.hover { a, a:link, a:visited, .btn-primary.hover {
color: var(--header); color: var(--text-main);
} }
#accessoriesTable>tbody>tr>td>nobr>a>i.fa { #accessoriesTable>tbody>tr>td>nobr>a>i.fa {
color: var(--text-main); color: var(--text-main);
@ -159,11 +159,11 @@ body {
} }
.box-body, .box-footer, .box-header { .box-body, .box-footer, .box-header {
background-color: var(--back-sub); background-color: var(--back-sub);
color: var(--header); color: var(--text-main);
} }
.btn-default{ .btn-default{
background-color: var(--back-main); background-color: var(--back-main);
color: var(--header); color: var(--text-main);
} }
.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active { .btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {
background-color: var(--back-sub); background-color: var(--back-sub);
@ -310,12 +310,12 @@ input[type=text], input[type=search] {
a { a {
color: var(--link); color: var(--link);
&:link { &:link {
color: var(--header) } color: var(--text-main) }
&:hover { &:hover {
color: var(--light-link); color: var(--light-link);
} }
&:visited { &:visited {
color: var(--header) color: var(--text-sub)
} }
} }