From 1569112105b827e63c267697910a07260205365e Mon Sep 17 00:00:00 2001 From: Stephen Cameron Date: Mon, 30 Mar 2020 17:59:32 +0200 Subject: [PATCH] Fix #3532 @5 --- wp-content/themes/CCV/index.php | 27 ++++++++--- .../CCV/resources/views/layouts/app.blade.php | 45 +++++++++---------- .../resources/views/partials/head.blade.php | 9 ---- 3 files changed, 42 insertions(+), 39 deletions(-) delete mode 100644 wp-content/themes/CCV/resources/views/partials/head.blade.php diff --git a/wp-content/themes/CCV/index.php b/wp-content/themes/CCV/index.php index 68725fe..bf7ac5a 100644 --- a/wp-content/themes/CCV/index.php +++ b/wp-content/themes/CCV/index.php @@ -1,7 +1,24 @@ - +> + + + + -use function Roots\app; -use function Roots\view; + -/** Loads the template hierarchy view file */ -echo view(app('sage.view'), app('sage.data')); + + + +> + + + +
+ render(); ?> +
+ + + + + diff --git a/wp-content/themes/CCV/resources/views/layouts/app.blade.php b/wp-content/themes/CCV/resources/views/layouts/app.blade.php index a853f96..ebffaaf 100644 --- a/wp-content/themes/CCV/resources/views/layouts/app.blade.php +++ b/wp-content/themes/CCV/resources/views/layouts/app.blade.php @@ -1,30 +1,25 @@ - - - @include('partials.head') +{{-- See theme root index.php for main wrapper HTML --}} +{{-- + Wrapper was moved to index in order to resolve a problem with scripts + not enqueuing sometimes. Manual merge of some changes here: + https://github.com/roots/sage/commit/4a7ff33d85048634d37e95d7e472f8bb264e812d +--}} - +@include('partials.header') -
- @php(wp_body_open()) - @php(do_action('get_header')) - @include('partials.header') +
+
+ @yield('content') +
-
- @yield('content') -
+ {{-- + @hasSection('sidebar') + + @endif + --}} - {{-- - @hasSection('sidebar') - - @endif - --}} +
- @php(do_action('get_footer')) - @include('partials.footer') - - @php(wp_footer()) -
- - +@include('partials.footer') diff --git a/wp-content/themes/CCV/resources/views/partials/head.blade.php b/wp-content/themes/CCV/resources/views/partials/head.blade.php deleted file mode 100644 index 8e016ac..0000000 --- a/wp-content/themes/CCV/resources/views/partials/head.blade.php +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - @php(wp_head()) - - - -- 2.39.5