From c9f8b513b0853eca7dda3dfcf3d7a0a004e41912 Mon Sep 17 00:00:00 2001
From: Jakob Scheid
 <jakob.scheid@developers.internal.seekra.jcloud-services.ddns.net>
Date: Tue, 28 Jul 2026 19:40:55 +0200
Subject: [PATCH] chore: resolve merge conflicts

---
 src/App.vue | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index f40f23a..4816792 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -59,10 +59,9 @@ watch(colorScheme, (newValue) => {
     --main-content-padding-x: 30px;
     --main-content-padding-y: 40px;
     --main-content-padding: var(--main-content-padding-y) var(--main-content-padding-x);
-}
-
-.main-content {
-    flex-grow: 1;
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
 }
 
 @media (max-width: 48rem) {
@@ -71,9 +70,7 @@ watch(colorScheme, (newValue) => {
     }
 }
 
-#app-wrapper {
-    min-height: 100vh;
-    display: flex;
-    flex-direction: column;
+.main-content {
+    flex-grow: 1;
 }
 </style>
\ No newline at end of file