From dd114a47981f5f7de301972bfc2f44d5f8a22ee9 Mon Sep 17 00:00:00 2001 From: Brandon Date: Mon, 18 Dec 2023 20:15:03 -0600 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=8E=A8=20Move=20default=20theme=20mar?= =?UTF-8?q?kup=20to=20the=20`app`=20layout=20=F0=9F=90=9B=20Fix=20uncontro?= =?UTF-8?q?llable=20HTML=20output=20(Fixes=20#3166)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.php | 21 +------------ resources/views/layouts/app.blade.php | 45 +++++++++++++++++++-------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/index.php b/index.php index 2738f4a997..239261d154 100644 --- a/index.php +++ b/index.php @@ -1,20 +1 @@ - -> - - - - - - - > - - - -
- render(); ?> -
- - - - - +render(); ?> diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 3f7d3024f7..fd6fd8408d 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -1,17 +1,36 @@ - - {{ __('Skip to content') }} - + + + + + + @php(wp_head()) + -@include('sections.header') + + @php(wp_body_open()) + @php(do_action('get_header')) -
- @yield('content') -
+
+ + {{ __('Skip to content') }} + - @hasSection('sidebar') - - @endif + @include('sections.header') -@include('sections.footer') +
+ @yield('content') +
+ + @hasSection('sidebar') + + @endif + + @include('sections.footer') +
+ + @php(do_action('get_footer')) + @php(wp_footer()) + + From b94e545e82f2f0e886a949462a152233308312eb Mon Sep 17 00:00:00 2001 From: Brandon Date: Mon, 18 Dec 2023 20:20:26 -0600 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=94=A7=20Remove=20`index.php`=20from?= =?UTF-8?q?=20the=20Tailwind=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tailwind.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tailwind.config.js b/tailwind.config.js index 5731fce609..2f66ee2501 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,6 +1,6 @@ /** @type {import('tailwindcss').Config} config */ const config = { - content: ['./index.php', './app/**/*.php', './resources/**/*.{php,vue,js}'], + content: ['./app/**/*.php', './resources/**/*.{php,vue,js}'], theme: { extend: { colors: {}, // Extend Tailwind's default colors From aa2d27699b7f7bf9f59cb03b7e8839ff5f5920b5 Mon Sep 17 00:00:00 2001 From: Log1x Date: Tue, 19 Dec 2023 02:21:37 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=8E=A8=20Run=20Pint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/View/Composers/Post.php | 2 +- index.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/View/Composers/Post.php b/app/View/Composers/Post.php index 5bcef38428..3366b0d439 100644 --- a/app/View/Composers/Post.php +++ b/app/View/Composers/Post.php @@ -77,7 +77,7 @@ public function pagination() { return wp_link_pages([ 'echo' => 0, - 'before' => '

' . __('Pages:', 'sage'), + 'before' => '

'.__('Pages:', 'sage'), 'after' => '

', ]); } diff --git a/index.php b/index.php index 239261d154..52854a0e27 100644 --- a/index.php +++ b/index.php @@ -1 +1 @@ -render(); ?> +render(); From 66a39822eeea46ca57073f49d969fc5fc21ee7c2 Mon Sep 17 00:00:00 2001 From: Brandon Date: Mon, 18 Dec 2023 23:37:35 -0600 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=9A=A8=20Run=20phpcbf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/View/Composers/Post.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/View/Composers/Post.php b/app/View/Composers/Post.php index 3366b0d439..5bcef38428 100644 --- a/app/View/Composers/Post.php +++ b/app/View/Composers/Post.php @@ -77,7 +77,7 @@ public function pagination() { return wp_link_pages([ 'echo' => 0, - 'before' => '

'.__('Pages:', 'sage'), + 'before' => '

' . __('Pages:', 'sage'), 'after' => '

', ]); } From 94a1787838f0490febe4f3543e3b69b41b750f6f Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 4 Jan 2024 00:30:48 -0600 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=A9=B9=20Move=20`get=5Fheader`=20hook?= =?UTF-8?q?=20above=20`wp=5Fhead()`=20(Fixes=20#3171)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/layouts/app.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index fd6fd8408d..57345e8d9f 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -3,12 +3,12 @@ + @php(do_action('get_header')) @php(wp_head()) @php(wp_body_open()) - @php(do_action('get_header'))