chore: resolve merge conflicts

This commit is contained in:
2026-07-28 19:44:02 +02:00
parent 630a8268e3
commit bd3c1042b2
+5 -6
View File
@@ -59,6 +59,11 @@ watch(colorScheme, (newValue) => {
--main-content-padding-x: 30px; --main-content-padding-x: 30px;
--main-content-padding-y: 40px; --main-content-padding-y: 40px;
--main-content-padding: var(--main-content-padding-y) var(--main-content-padding-x); --main-content-padding: var(--main-content-padding-y) var(--main-content-padding-x);
min-height: 100vh;
display: flex;
flex-direction: column;
background-color: var(--light-bg);
color: var(--dark);
} }
.main-content { .main-content {
@@ -70,10 +75,4 @@ watch(colorScheme, (newValue) => {
--main-content-padding-x: 15px; --main-content-padding-x: 15px;
} }
} }
#app-wrapper {
min-height: 100vh;
display: flex;
flex-direction: column;
}
</style> </style>