Merge remote-tracking branch 'skyhome/dev' into dev

.env.example

@@ -10,9 +10,9 @@ VITE_SITE_APPLE_LOGO = "/images/logo/apple-touch-icon.png" # Apple 端图标
 
 # 简介文本
 VITE_DESC_HELLO = "Hello World !"
-VITE_DESC_TEXT = "Hi ! 欢迎来到我的主页"
+VITE_DESC_TEXT = "Hi ! 一名喜欢折腾计算机与网络的“过客”，欢迎来到我的主页。"
 VITE_DESC_HELLO_OTHER = "Oops !"
-VITE_DESC_TEXT_OTHER = "哎呀，这都被你发现了 (再点击一次可关闭)"
+VITE_DESC_TEXT_OTHER = "哎呀，这都被你发现了 ! "
 
 # 社交链接
 ## 请在 src/assets/socialLinks.json 文件中配置

src/assets/siteLinks.json

@@ -16,8 +16,8 @@
   },
   {
     "icon": "ImageRegular",
-    "name": "图床",
-    "link": "https://img.lonelyxm.com/"
+    "name": "图集",
+    "link": "https://pic.lonelyx.cn"
   },
   {
     "icon": "Toolbox",

src/components/Message.vue

@@ -15,12 +15,19 @@
         <Icon size="16">
           <QuoteLeft />
         </Icon>
+<<<<<<< HEAD
         <Transition name="fade" mode="out-in">
           <div :key="descriptionText.hello + descriptionText.text" class="text">
             <p>{{ descriptionText.hello }}</p>
             <p>{{ descriptionText.text }}</p>
           </div>
         </Transition>
+=======
+        <div class="text">
+          <p>{{ descriptionText.hello }}</p>
+          <p>{{ descriptionText.text }}</p>
+        </div>
+>>>>>>> skyhome/dev
         <Icon size="16">
           <QuoteRight />
         </Icon>
@@ -188,24 +195,5 @@ watch(
       margin-top: 2.5rem;
     }
   }
-  .typewriter {
-    overflow: hidden;
-    white-space: nowrap;
-    display: inline-block;
-    overflow: hidden;
-    animation: typing 5s steps(100, start) 1;
-    /* 文字逐个出现 */
-  }
-
-  /* 打字动画 */
-  @keyframes typing {
-    from {
-    width: 0;
-    }
-
-    to {
-    width: 130%;
-    }
-  }
 }
 </style>