From 1c0b60e5e047e3be2b88256eef0a04a2fb22dd74 Mon Sep 17 00:00:00 2001
From: Mihkel Martin Kasterpalu <qpeuitovxg@use.startmail.com>
Date: Wed, 22 Jan 2025 16:04:16 +0200
Subject: [PATCH] Simplify layout across site

---
 src/routes/(games)/(singlescreen)/+layout.svelte           | 7 -------
 .../(games)/{(singlescreen) => }/pakubiiti/+page.server.ts | 0
 .../(games)/{(singlescreen) => }/pakubiiti/+page.svelte    | 2 +-
 src/routes/(landing)/+layout.svelte                        | 7 -------
 src/routes/+layout.svelte                                  | 4 +++-
 src/routes/{(landing) => }/+page.svelte                    | 2 +-
 6 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 src/routes/(games)/(singlescreen)/+layout.svelte
 rename src/routes/(games)/{(singlescreen) => }/pakubiiti/+page.server.ts (100%)
 rename src/routes/(games)/{(singlescreen) => }/pakubiiti/+page.svelte (98%)
 delete mode 100644 src/routes/(landing)/+layout.svelte
 rename src/routes/{(landing) => }/+page.svelte (94%)

diff --git a/src/routes/(games)/(singlescreen)/+layout.svelte b/src/routes/(games)/(singlescreen)/+layout.svelte
deleted file mode 100644
index aa7f751..0000000
--- a/src/routes/(games)/(singlescreen)/+layout.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script lang="ts">
-	let { children } = $props();
-</script>
-
-<div class="container flex min-h-screen flex-col items-center justify-center py-4">
-	{@render children()}
-</div>
diff --git a/src/routes/(games)/(singlescreen)/pakubiiti/+page.server.ts b/src/routes/(games)/pakubiiti/+page.server.ts
similarity index 100%
rename from src/routes/(games)/(singlescreen)/pakubiiti/+page.server.ts
rename to src/routes/(games)/pakubiiti/+page.server.ts
diff --git a/src/routes/(games)/(singlescreen)/pakubiiti/+page.svelte b/src/routes/(games)/pakubiiti/+page.svelte
similarity index 98%
rename from src/routes/(games)/(singlescreen)/pakubiiti/+page.svelte
rename to src/routes/(games)/pakubiiti/+page.svelte
index 22d09e0..35e68d3 100644
--- a/src/routes/(games)/(singlescreen)/pakubiiti/+page.svelte
+++ b/src/routes/(games)/pakubiiti/+page.svelte
@@ -93,7 +93,7 @@
 	</AlertDialog.Content>
 </AlertDialog.Root>
 
-<header class="font-title mb-24 flex flex-col items-center">
+<header class="font-title mb-16 flex flex-col items-center">
 	<h1 class="mb-1 scroll-m-20 text-6xl font-extrabold tracking-tight lg:text-7xl">Paku biiti</h1>
 	<p class="text-2xl font-semibold text-muted-foreground">
 		Lohista kokku õiged albumi <span class="text-red-600 dark:text-red-400">nimed</span>,
diff --git a/src/routes/(landing)/+layout.svelte b/src/routes/(landing)/+layout.svelte
deleted file mode 100644
index 3efb8c2..0000000
--- a/src/routes/(landing)/+layout.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script lang="ts">
-	let { children } = $props();
-</script>
-
-<div class="container mt-32 flex flex-col items-center py-4">
-	{@render children()}
-</div>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 2ed15dc..b43f3b6 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -51,4 +51,6 @@
 	</Button>
 </header>
 
-{@render children()}
+<div class="container mt-24 flex flex-col items-center py-4">
+	{@render children()}
+</div>
diff --git a/src/routes/(landing)/+page.svelte b/src/routes/+page.svelte
similarity index 94%
rename from src/routes/(landing)/+page.svelte
rename to src/routes/+page.svelte
index 2af592f..2644358 100644
--- a/src/routes/(landing)/+page.svelte
+++ b/src/routes/+page.svelte
@@ -12,7 +12,7 @@
 	<meta property="og:image" content={baseURL + '/favicon.svg'} />
 </svelte:head>
 
-<header class="mb-24 flex flex-col items-center font-title">
+<header class="font-title mb-24 flex flex-col items-center">
 	<h1 class="mb-1 scroll-m-20 text-6xl font-extrabold tracking-tight lg:text-7xl">
 		stuff.kasterpalu.ee
 	</h1>