DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-03 09:57:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json
This commit is contained in:
snipe 2023-06-29 20:41:05 +01:00
parent 4dd71e0332 e236bf412c
commit af26ec471f
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1136,7 +1136,7 @@ class SettingsController extends Controller
public function postBackups() public function postBackups()
{ {
if (! config('app.lock_passwords')) { if (! config('app.lock_passwords')) {
Artisan::call('snipeit:backup', ['--filename' => 'manual-backup-'.date('Y-m-d-H:i:s')]); Artisan::call('snipeit:backup', ['--filename' => 'manual-backup-'.date('Y-m-d-H-i-s')]);
$output = Artisan::output(); $output = Artisan::output();
// Backup completed // Backup completed

7
resources/assets/less/skins/skin-yellow-dark.less
View file

@ -78,7 +78,9 @@
a.actions { a.actions {
color:#fff !important; color:#fff !important;
} }
a:visited.label-default, a:link.label-default{
color:#444;
}
/** /**
The dropdown is white, so use a darker color The dropdown is white, so use a darker color
*/ */
@ -159,9 +161,6 @@ h2.task_menu{
background: linear-gradient(to bottom, var(--header) 0%,var(--header) 100%); background: linear-gradient(to bottom, var(--header) 0%,var(--header) 100%);
border-color: var(--header); border-color: var(--header);
} }
.label-default{
background-color:var(--back-sub);
}
a.btn.btn-default{ a.btn.btn-default{
color:var(--nav-link); color:var(--nav-link);
} }