chore: resolve merge conflicts

2026-07-28 19:40:55 +02:00
parent 630a8268e3
commit c9f8b513b0
1 changed files with 5 additions and 8 deletions
@@ -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>