diff --git a/app/Settings/AppSettingsStore.php b/app/Settings/AppSettingsStore.php index f2b6cdc52..8d7b73c1c 100644 --- a/app/Settings/AppSettingsStore.php +++ b/app/Settings/AppSettingsStore.php @@ -25,7 +25,7 @@ class AppSettingsStore protected function updateAppIcon(Request $request): void { - $sizes = [128, 64, 32]; + $sizes = [180, 128, 64, 32]; // Update icon image if set if ($request->hasFile('app_icon')) { @@ -35,6 +35,7 @@ class AppSettingsStore setting()->put('app-icon', $image->url); foreach ($sizes as $size) { + $this->destroyExistingSettingImage('app-icon-' . $size); $icon = $this->imageRepo->saveNew($iconFile, 'system', 0, $size, $size); setting()->put('app-icon-' . $size, $icon->url); } diff --git a/app/Uploads/ImageRepo.php b/app/Uploads/ImageRepo.php index 910248203..2c643a58b 100644 --- a/app/Uploads/ImageRepo.php +++ b/app/Uploads/ImageRepo.php @@ -123,7 +123,10 @@ class ImageRepo public function saveNew(UploadedFile $uploadFile, string $type, int $uploadedTo = 0, int $resizeWidth = null, int $resizeHeight = null, bool $keepRatio = true): Image { $image = $this->imageService->saveNewFromUpload($uploadFile, $type, $uploadedTo, $resizeWidth, $resizeHeight, $keepRatio); - $this->loadThumbs($image); + + if ($type !== 'system') { + $this->loadThumbs($image); + } return $image; } diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php index 318dc0a52..023cf1beb 100755 --- a/resources/lang/en/settings.php +++ b/resources/lang/en/settings.php @@ -34,6 +34,8 @@ return [ 'app_custom_html_disabled_notice' => 'Custom HTML head content is disabled on this settings page to ensure any breaking changes can be reverted.', 'app_logo' => 'Application Logo', 'app_logo_desc' => 'This is used in the application header bar, among other areas. This image should be 86px in height. Large images will be scaled down.', + 'app_icon' => 'Application Icon', + 'app_icon_desc' => 'This icon is used for browser tabs and shortcut icons. This should be a 256px square PNG image.', 'app_primary_color' => 'Application Primary Color', 'app_primary_color_desc' => 'Sets the primary color for the application including the banner, buttons, and links.', 'app_homepage' => 'Application Homepage', diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index b09a8dfe9..e0a6f46d0 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -6,10 +6,11 @@ {{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name') }} + - + @@ -21,10 +22,12 @@ - - - - + + + + + + @yield('head') diff --git a/resources/views/settings/customization.blade.php b/resources/views/settings/customization.blade.php index 847704007..aa37c30c9 100644 --- a/resources/views/settings/customization.blade.php +++ b/resources/views/settings/customization.blade.php @@ -55,11 +55,8 @@
- -

- This icon is used for browser tabs and shortcut icons. - This should be a 256px square PNG image. -

+ +

{{ trans('settings.app_icon_desc') }}

@include('form.image-picker', [