From dd114a47981f5f7de301972bfc2f44d5f8a22ee9 Mon Sep 17 00:00:00 2001
From: Brandon <brandon@tendency.me>
Date: Mon, 18 Dec 2023 20:15:03 -0600
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Move=20default=20theme=20markup?=
 =?UTF-8?q?=20to=20the=20`app`=20layout=20=F0=9F=90=9B=20Fix=20uncontrolla?=
 =?UTF-8?q?ble=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 2738f4a..239261d 100644
--- a/index.php
+++ b/index.php
@@ -1,20 +1 @@
-<!doctype html>
-<html <?php language_attributes(); ?>>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <?php wp_head(); ?>
-  </head>
-
-  <body <?php body_class(); ?>>
-    <?php wp_body_open(); ?>
-    <?php do_action('get_header'); ?>
-
-    <div id="app">
-      <?php echo view(app('sage.view'), app('sage.data'))->render(); ?>
-    </div>
-
-    <?php do_action('get_footer'); ?>
-    <?php wp_footer(); ?>
-  </body>
-</html>
+<?php echo view(app('sage.view'), app('sage.data'))->render(); ?>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 3f7d302..fd6fd84 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -1,17 +1,36 @@
-<a class="sr-only focus:not-sr-only" href="#main">
-  {{ __('Skip to content') }}
-</a>
+<!doctype html>
+<html @php(language_attributes())>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    @php(wp_head())
+  </head>
 
-@include('sections.header')
+  <body @php(body_class())>
+    @php(wp_body_open())
+    @php(do_action('get_header'))
 
-  <main id="main" class="main">
-    @yield('content')
-  </main>
+    <div id="app">
+      <a class="sr-only focus:not-sr-only" href="#main">
+        {{ __('Skip to content') }}
+      </a>
 
-  @hasSection('sidebar')
-    <aside class="sidebar">
-      @yield('sidebar')
-    </aside>
-  @endif
+      @include('sections.header')
 
-@include('sections.footer')
+      <main id="main" class="main">
+        @yield('content')
+      </main>
+
+      @hasSection('sidebar')
+        <aside class="sidebar">
+          @yield('sidebar')
+        </aside>
+      @endif
+
+      @include('sections.footer')
+    </div>
+
+    @php(do_action('get_footer'))
+    @php(wp_footer())
+  </body>
+</html>
