From a10890d6152d87d51355d9ce01552a987b65baa2 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 | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index f40f23a..e583c64 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -59,6 +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);
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
 }
 
 .main-content {
@@ -70,10 +73,4 @@ watch(colorScheme, (newValue) => {
         --main-content-padding-x: 15px;
     }
 }
-
-#app-wrapper {
-    min-height: 100vh;
-    display: flex;
-    flex-direction: column;
-}
 </style>
\ No newline at end of file