From 83fb3746908461d30e73471e7c7cbbd486e001b8 Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Mon, 14 Feb 2022 17:08:55 +0800
Subject: [PATCH] 字体修改

---
 src/components/swichLabel/main1-show.vue |   23 ++++++++++++++++++-----
 src/components/mini/tagInfo.vue          |    4 ++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/components/mini/tagInfo.vue b/src/components/mini/tagInfo.vue
index d42c433..298c83b 100644
--- a/src/components/mini/tagInfo.vue
+++ b/src/components/mini/tagInfo.vue
@@ -20,7 +20,7 @@
 					<li>
 
 						<img src="http://t.inleft.com/share/media_photo/xm.jpg"
-							style="width: 35px;border-radius: 20px;" />
+							style="width: 50px;border-radius: 20px;" />
 						我的小老弟&御用暖床袋
 						<img src="http://t.inleft.com/share/media_photo/IMG_20220117_145633.jpg"
 							style="width: 50px;border-radius: 30px" />
@@ -52,7 +52,7 @@
 				<br>"哎..给我一个拥抱吧"..我试探下张了双臂,她稍微停了下,还是靠了过来..
 				<br>
 				<br>只须臾片刻,便消千万年间
-				<br>离开她的怀抱后,我比了比个六的手势:"其实,六年前,到现在为止"..趁机,我在她耳边,轻轻地道:"***,***"
+				<br>离开她的怀抱后,我比了比个手势:"其实,六年前,到现在为止"..趁机,我在她耳边,轻轻地道:"***,***"
 				<br>
 				<br>end..希望我们的故事还没有终点..
 			</a-timeline-item>
diff --git a/src/components/swichLabel/main1-show.vue b/src/components/swichLabel/main1-show.vue
index af389a3..45172ae 100644
--- a/src/components/swichLabel/main1-show.vue
+++ b/src/components/swichLabel/main1-show.vue
@@ -159,6 +159,16 @@
 </script>
 
 <style lang="less">
+	@font-face {
+		font-family: 'HYTangMeiRen';
+		// font-display: swap;
+		src: url("https://unpkg.zhimg.com/fontawepro@latest/fonts/hytmr55.woff") format("truetype");
+	}
+
+	span,p,a,body,h1,h2,h3,h4,h5,h6,code {
+		font-family: HYTangMeiRen !important;
+	}
+
 	.swichTag {
 		min-height: 750px;
 		padding: 30px 30px 10px;
@@ -231,7 +241,7 @@
 		text-align: center;
 		padding-top: 20px;
 		padding-bottom: 20px;
-		max-height: 300px;
+		// max-height: 300px;
 		/*margin-top: 10px;*/
 		/*min-height: 200px;*/
 
@@ -241,7 +251,7 @@
 
 		padding-top: 10px;
 		padding-bottom: 20px;
-		overflow: hidden;
+		// overflow: hidden;
 		// box-shadow: 1px 1px 1px 2px #00000059;
 
 		// -webkit-box-shadow: 0 12px 15px 0 rgba(0, 0, 0, 0.24), 0 17px 50px 0 rgba(0, 0, 0, 0.19);
@@ -254,6 +264,8 @@
 		-moz-transition: all .6s;
 		-o-transition: all .6s;
 		-ms-transition: all .6s;
+		transition: height 2s;
+
 	}
 
 	//div本体阴影
@@ -269,10 +281,11 @@
 
 	.blog-scroll {
 		padding-top: 10px;
-		max-height: 200px;
-
 		overflow-x: hidden;
-		overflow-y: overlay;
+		overflow-y: hidden;
+
+		transition: height 1s;
+
 	}
 
 

--
Gitblit v1.9.1