From cf368a4577b1987db49a8ebc9790b302db12e925 Mon Sep 17 00:00:00 2001 From: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Mon, 1 Feb 2021 13:50:37 -0800 Subject: [PATCH 1/2] fixed an issue with links colors (#9073) * fixed an issue with links colors * corrected btn-default's color --- public/css/dist/skins/skin-black-dark.css | 10 +++++----- public/css/dist/skins/skin-black-dark.min.css | 10 +++++----- public/mix-manifest.json | 4 ++-- resources/assets/less/skins/skin-black-dark.less | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/public/css/dist/skins/skin-black-dark.css b/public/css/dist/skins/skin-black-dark.css index 2c57a84e9..55158a422 100644 --- a/public/css/dist/skins/skin-black-dark.css +++ b/public/css/dist/skins/skin-black-dark.css @@ -205,7 +205,7 @@ a, a:link, a:visited, .btn-primary.hover { - color: var(--header); + color: var(--text-main); } #accessoriesTable > tbody > tr > td > nobr > a > i.fa { color: var(--text-main); @@ -228,11 +228,11 @@ body { .box-footer, .box-header { background-color: var(--back-sub); - color: var(--header); + color: var(--text-main); } .btn-default { background-color: var(--back-main); - color: var(--header); + color: var(--text-main); } .btn-default:active, .btn-default:focus, @@ -408,13 +408,13 @@ a { color: var(--link); } a:link { - color: var(--header); + color: var(--text-main); } a:hover { color: var(--light-link); } a:visited { - color: var(--header); + color: var(--text-sub); } .row-striped { vertical-align: top; diff --git a/public/css/dist/skins/skin-black-dark.min.css b/public/css/dist/skins/skin-black-dark.min.css index 2c57a84e9..55158a422 100644 --- a/public/css/dist/skins/skin-black-dark.min.css +++ b/public/css/dist/skins/skin-black-dark.min.css @@ -205,7 +205,7 @@ a, a:link, a:visited, .btn-primary.hover { - color: var(--header); + color: var(--text-main); } #accessoriesTable > tbody > tr > td > nobr > a > i.fa { color: var(--text-main); @@ -228,11 +228,11 @@ body { .box-footer, .box-header { background-color: var(--back-sub); - color: var(--header); + color: var(--text-main); } .btn-default { background-color: var(--back-main); - color: var(--header); + color: var(--text-main); } .btn-default:active, .btn-default:focus, @@ -408,13 +408,13 @@ a { color: var(--link); } a:link { - color: var(--header); + color: var(--text-main); } a:hover { color: var(--light-link); } a:visited { - color: var(--header); + color: var(--text-sub); } .row-striped { vertical-align: top; diff --git a/public/mix-manifest.json b/public/mix-manifest.json index d0e04bd24..8f03d3461 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -9,7 +9,7 @@ "/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-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-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", @@ -22,7 +22,7 @@ "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a", "/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-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-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", diff --git a/resources/assets/less/skins/skin-black-dark.less b/resources/assets/less/skins/skin-black-dark.less index 73bf4997b..80bc31a8b 100644 --- a/resources/assets/less/skins/skin-black-dark.less +++ b/resources/assets/less/skins/skin-black-dark.less @@ -139,7 +139,7 @@ a { } a, a:link, a:visited, .btn-primary.hover { - color: var(--header); + color: var(--text-main); } #accessoriesTable>tbody>tr>td>nobr>a>i.fa { color: var(--text-main); @@ -159,11 +159,11 @@ body { } .box-body, .box-footer, .box-header { background-color: var(--back-sub); - color: var(--header); + color: var(--text-main); } .btn-default{ background-color: var(--back-main); - color: var(--header); + color: var(--text-main); } .btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active { background-color: var(--back-sub); @@ -310,12 +310,12 @@ input[type=text], input[type=search] { a { color: var(--link); &:link { - color: var(--header) } + color: var(--text-main) } &:hover { color: var(--light-link); } &:visited { - color: var(--header) + color: var(--text-sub) } } From ef668317a97a387cd8c37b80ac1ed55dc3f65c33 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 2 Feb 2021 01:58:50 -0800 Subject: [PATCH 2/2] Log user initiating a purge --- app/Http/Controllers/SettingsController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 2bdf6ca4a..cd2b77b88 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -1158,6 +1158,8 @@ class SettingsController extends Controller { if (! config('app.lock_passwords')) { if ('DELETE' == $request->input('confirm_purge')) { + + \Log::warning('User ID '.Auth::user()->id.' initiated a PURGE!'); // Run a backup immediately before processing Artisan::call('backup:run'); Artisan::call('snipeit:purge', ['--force' => 'true', '--no-interaction' => true]);