From: Dan Brown Date: Mon, 2 Oct 2023 14:58:07 +0000 (+0100) Subject: Merge branch 'basic-pwa-support' into development X-Git-Tag: v23.10~1^2~19 X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/d1f28ed245ae674a610ea6d5094ab3ea5d30b0cc?hp=-c Merge branch 'basic-pwa-support' into development --- d1f28ed245ae674a610ea6d5094ab3ea5d30b0cc diff --combined resources/views/layouts/base.blade.php index f9dbc68b4,8693f021d..67b074905 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@@ -10,7 -10,7 +10,7 @@@ - + @@@ -29,11 -29,15 +29,15 @@@ + + + + @yield('head') - @include('common.custom-styles') - @include('common.custom-head') + @include('layouts.parts.custom-styles') + @include('layouts.parts.custom-head') @stack('head') @@@ -48,15 -52,15 +52,15 @@@ class="@stack('body-class')"> @include('layouts.parts.base-body-start') - @include('common.skip-to-content') - @include('common.notifications') - @include('common.header') + @include('layouts.parts.skip-to-content') + @include('layouts.parts.notifications') + @include('layouts.parts.header')
@yield('content')
- @include('common.footer') + @include('layouts.parts.footer')