chore: resolve merge conflicts

2026-07-28 19:42:34 +02:00
1 changed files with 4 additions and 4 deletions
@@ -64,13 +64,13 @@ watch(colorScheme, (newValue) => {
    flex-direction: column;
 }

+.main-content {
+    flex-grow: 1;
+}
+
@media (max-width: 48rem) {
    #app-wrapper {
        --main-content-padding-x: 15px;
    }
 }
-
-.main-content {
-    flex-grow: 1;
-}
 </style>