Merge branch 'main' of http://18.167.251.121:10003/aidlab/FiDA_Front

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