diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php index a607782be..71d0d84d9 100644 --- a/app/Composers/AppComposer.php +++ b/app/Composers/AppComposer.php @@ -39,7 +39,7 @@ class AppComposer $view->withAppGraphs(Setting::get('display_graphs')); $view->withAppLocale(Setting::get('app_locale')); $view->withAppName(Setting::get('app_name')); - $view->withAppStylesheet(Setting::get('app_stylesheet')); + $view->withAppStylesheet(Setting::get('stylesheet')); $view->withAppUrl(Config::get('app.url')); $view->withShowSupport(Setting::get('show_support')); } diff --git a/resources/views/dashboard/partials/head.blade.php b/resources/views/dashboard/partials/head.blade.php index d40c51823..390b1f415 100644 --- a/resources/views/dashboard/partials/head.blade.php +++ b/resources/views/dashboard/partials/head.blade.php @@ -18,7 +18,7 @@ - @yield('pageTitle', $app_name.' | Cachet') + {{ $page_title or $app_name.' | Cachet' }} diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php index dc51c8218..9f7512f1e 100644 --- a/resources/views/layout/master.blade.php +++ b/resources/views/layout/master.blade.php @@ -44,9 +44,9 @@ @include('partials.crowdin') - @if($stylesheet = $app_stylesheet) + @if($app_stylesheet) @endif