fix

2026-02-04 10:12:13 +08:00
parent bf3631fffb
commit 1b17eb1dd2
2 changed files with 9 additions and 12 deletions
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -1,18 +1,18 @@
-<<<<<<< HEAD
-=======
 body,
 html,
-p,
+div,
 ul,
-ol,
-li {
+li,
+h1,
+h2,
+h3,
+p {
  margin: 0;
  padding: 0;
 }
 * {
  box-sizing: border-box;
 }
->>>>>>> 92ef11cd6d1f41ef95ef0cc8190c4f45f931f003
 html,
 body,
 #app {
@@ -28,11 +28,8 @@ body,
    transform: rotate(360deg);
  }
 }
-<<<<<<< HEAD
 .background-pink {
  background-color: #f8f7f5;
  background-image: url('@/assets/images/home-bg.png');
  background-size: 100% 100%;
 }
-=======
->>>>>>> 92ef11cd6d1f41ef95ef0cc8190c4f45f931f003