resolve conflict

This commit is contained in:
p2405951
2025-12-10 14:59:58 +01:00
84 changed files with 2825 additions and 972 deletions
+9 -5
View File
@@ -1,8 +1,10 @@
* {
margin: 0;
padding: 0;
width: 100%;
box-sizing: border-box;
}
html {
overflow-x: hidden;
}
@@ -17,16 +19,19 @@
-moz-osx-font-smoothing: grayscale;
}
@media screen and (max-width: 768px) {
.content{
padding: 0.7rem;
}
}
.content {
padding: 1.5rem;
z-index: 1;
width: 100%;
}
a {
font-weight: 500;
color: #646cff;
@@ -45,7 +50,6 @@ body {
/*.glassCard {
width: 100%;
padding: 10px;
height: fit-content;
background: rgba(255, 255, 255, 0.65);
backdrop-filter: blur(3px);