feat: revert previous move of pages and update layout

package-lock.json

@@ -8,7 +8,7 @@
       "name": "~TODO~",
       "version": "0.0.1",
       "dependencies": {
-        "@damillora/plachta": "^4.1.2",
+        "@damillora/plachta": "^4.3.0",
         "@sveltejs/adapter-node": "^1.1.6",
         "dayjs": "^1.11.7",
         "howler": "^2.2.3",
@@ -155,9 +155,9 @@
       }
     },
     "node_modules/@damillora/plachta": {
-      "version": "4.1.2",
+      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@damillora/plachta/-/plachta-4.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@damillora/plachta/-/plachta-4.3.0.tgz",
-      "integrity": "sha512-Y54dX/am9QeZFjNPvRO/PPqWzZ8SEkFYjMadDccq9I10MLjZn/mZ2BZOJjYtragKS+Yaovn/yTHqX3qDyWjRCg==",
+      "integrity": "sha512-XW6T2yerFhP8fNzAAYgGO1rZvb+s/YmKAqOKs0Ku4HHaGwwUaSsShCRq+xMi8M1mSOGCRszFjpqHJ79LehNGKg==",
       "dependencies": {
         "@sveltejs/package": "^2.2.0",
         "svelte": "^4.1.2",
@@ -3776,9 +3776,9 @@
       }
     },
     "@damillora/plachta": {
-      "version": "4.1.2",
+      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@damillora/plachta/-/plachta-4.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@damillora/plachta/-/plachta-4.3.0.tgz",
-      "integrity": "sha512-Y54dX/am9QeZFjNPvRO/PPqWzZ8SEkFYjMadDccq9I10MLjZn/mZ2BZOJjYtragKS+Yaovn/yTHqX3qDyWjRCg==",
+      "integrity": "sha512-XW6T2yerFhP8fNzAAYgGO1rZvb+s/YmKAqOKs0Ku4HHaGwwUaSsShCRq+xMi8M1mSOGCRszFjpqHJ79LehNGKg==",
       "requires": {
         "@sveltejs/package": "^2.2.0",
         "svelte": "^4.1.2",

package.json

@@ -25,7 +25,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@damillora/plachta": "^4.1.2",
+    "@damillora/plachta": "^4.3.0",
     "@sveltejs/adapter-node": "^1.1.6",
     "dayjs": "^1.11.7",
     "howler": "^2.2.3",

src/routes/(pages)/+layout.svelte

@@ -1,9 +0,0 @@
-<script>
-
-	import { Hero } from "@damillora/plachta";
-
-</script>
-
-
-<Hero background="/images/bg/283-yuika/bg-xxl.jpg" />
-<slot/>

src/routes/+layout.svelte

@@ -14,6 +14,7 @@
 <Base>
 	<SiteHeader />
 
+	<Hero background="/images/bg/283-yuika/bg-xxl.jpg" />
 	<slot />
 
 	<Footer>

src/routes/+page.svelte

@@ -1,35 +1,31 @@
 <script>
-	import { Hero, HeroContent, HeroList, Container, Index } from '@damillora/plachta';
+	import { Hero, HeroContent, HeroList, Container, Index, Post } from '@damillora/plachta';
 </script>
 
 <svelte:head>
 	<title>Damillora</title>
 </svelte:head>
 
-<HeroList>
+<Container>
-	<Hero background="/images/bg/283-yuika/bg-xxl.jpg">
+	<Post>
-		<HeroContent>
 		<h1>Programmer by day, DJ at night</h1>
 		<p>
-				Welcome to my personal website. I'm a programmer by day, and a DJ by night. 
+			Welcome to my personal website. I'm a programmer by day, and a DJ by night. This site serves
-				This site serves as my introduction, and lists my coding projects and game reviews as well.
+			as my introduction, and lists my coding projects and game reviews as well.
 		</p>
-		</HeroContent>
+	</Post>
-	</Hero>
+</Container>
-	<Hero background="/images/default-feature.jpg" halfWidth>
+<HeroList>
+	<Hero background="/images/default-feature.jpg" halfWidth contentSize="medium">
 		<HeroContent>
 			<h1><a href="/projects">Software Projects</a></h1>
-			<p>
+			<p>I make various software, including this very website.</p>
-				I make various software, including this very website.
-			</p>
 		</HeroContent>
 	</Hero>
-	<Hero background="/images/feature-dj.jpg" halfWidth>
+	<Hero background="/images/feature-dj.jpg" halfWidth contentSize="medium">
 		<HeroContent>
 			<h1><a href="/dj">DJ Damillora</a></h1>
-			<p>
+			<p>I focus on playing Japanese music vocals on top of club music.</p>
-				I focus on playing Japanese music vocals on top of club music.
-			</p>
 		</HeroContent>
 	</Hero>
 </HeroList>

src/routes/dj/+page.svelte

@@ -8,7 +8,7 @@
 	<title>Damillora: About</title>
 </svelte:head>
 
-<Hero background="/images/feature-dj.jpg">
+<Hero background="/images/feature-dj.jpg" contentSize="medium">
 	<HeroContent>
 		<h1 class="page-header__heading">DJ Damillora</h1>
 		<p>