Skip to content

Commit 8b7e088

Browse files
windshadow233windshadow233
committed
Updata blog
1 parent 1152931 commit 8b7e088

5 files changed

Lines changed: 32 additions & 44 deletions

File tree

‎_config.butterfly.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,6 +1101,7 @@ inject:
11011101
- <script type="text/javascript" src="https://fastly.jsdelivr.net/gh/windshadow233/BlogStorage@files/js/comment-barrage.js"></script>
11021102
- <script type="text/javascript" src="https://fastly.jsdelivr.net/gh/windshadow233/BlogStorage@files/js/waterfall@v2.0.0.js"></script>
11031103
- <script type="text/javascript" src="https://fastly.jsdelivr.net/gh/windshadow233/BlogStorage@files/js/mytalk@v0.0.5.js"></script>
1104+
- <script type="text/javascript" src="https://fastly.jsdelivr.net/gh/windshadow233/BlogStorage@files/js/lottie_light@v5.13.0.min.js"></script>
11041105
- <script type="text/javascript" src="/js/random.js"></script>
11051106
- <script type="text/javascript" src="/js/custom.js"></script>
11061107
bottom:

‎scripts/mbti.js‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,6 @@ hexo.extend.filter.register('template_locals', function (locals) {
77

88
const card_mbti = JSON.parse(JSON.stringify(card_mbti_src));
99

10-
const mbtiImages = {
11-
INTJ: 'https://blogfiles.oss.fyz666.xyz/svg/e54d2a84-55fd-414d-81af-7493ff2e11c1.svg',
12-
INTP: 'https://blogfiles.oss.fyz666.xyz/svg/a10c4445-b614-4d11-b45e-cfda23dbd485.svg',
13-
ENTJ: 'https://blogfiles.oss.fyz666.xyz/svg/c29d423d-b3ea-49a8-a78b-1f2c74133ba9.svg',
14-
ENTP: 'https://blogfiles.oss.fyz666.xyz/svg/c80b91f1-2305-46b7-bb13-1dca4b168983.svg',
15-
INFJ: 'https://blogfiles.oss.fyz666.xyz/svg/3a894383-b796-46f3-9320-6f39360d9a66.svg',
16-
INFP: 'https://blogfiles.oss.fyz666.xyz/svg/39e1659f-5eef-4709-bc5f-c5e588168293.svg',
17-
ENFJ: 'https://blogfiles.oss.fyz666.xyz/svg/40031020-9ea7-43e0-b2ac-fd0348181a66.svg',
18-
ENFP: 'https://blogfiles.oss.fyz666.xyz/svg/9e11c236-d35d-4118-b1f9-2ee9427b8dcb.svg',
19-
ISTJ: 'https://blogfiles.oss.fyz666.xyz/svg/1222b517-92dd-48dc-a4e7-b762bafb5419.svg',
20-
ISFJ: 'https://blogfiles.oss.fyz666.xyz/svg/4b4833f4-b189-419a-978b-a1e2ab594e4c.svg',
21-
ESFJ: 'https://blogfiles.oss.fyz666.xyz/svg/d2ea3f35-23f3-4475-b238-78deea37a8f3.svg',
22-
ESFP: 'https://blogfiles.oss.fyz666.xyz/svg/dd593ab0-1531-4816-9eff-1658f51ba35f.svg',
23-
ESTJ: 'https://blogfiles.oss.fyz666.xyz/svg/3ef072a8-b238-4c83-80af-33f33b85bc47.svg',
24-
ESTP: 'https://blogfiles.oss.fyz666.xyz/svg/643f62d0-777c-427b-b504-8796d02bb241.svg',
25-
ISFP: 'https://blogfiles.oss.fyz666.xyz/svg/688412b9-d42d-4a17-bf3a-64dfd4eb76fa.svg',
26-
ISTP: 'https://blogfiles.oss.fyz666.xyz/svg/ff7c5a0c-a453-45b1-a18a-aefa0253b555.svg'
27-
};
28-
2910
const mbtiNames = {
3011
INTJ: '架构师',
3112
INTP: '逻辑学家',
@@ -83,14 +64,14 @@ hexo.extend.filter.register('template_locals', function (locals) {
8364

8465
let mbti_text = mbtiKeys.map((k) => String(card_mbti[k]?.type || '')).join('');
8566
let mbti_text_additional = '';
86-
const image = mbtiImages[mbti_text] || '';
67+
const animation = `https://blogfiles.oss.fyz666.xyz/mbti-animation/${mbti_text.toLowerCase()}.json`;
8768
const name = mbtiNames[mbti_text] || '';
8869
if (card_mbti.at) {
8970
mbti_text_additional = `-${String(card_mbti.at.type || '')}`;
9071
}
9172
const mbti_text_full = `${mbti_text}${mbti_text_additional}`;
9273
const update = card_mbti.date;
9374

94-
locals.mbti = { card_mbti, percentValues, mbti_text, mbti_text_full, name, image, update};
75+
locals.mbti = { card_mbti, percentValues, mbti_text, mbti_text_full, name, animation, update};
9576
return locals;
9677
});

‎themes/butterfly/layout/includes/page/about.pug‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,17 @@
134134
| 了解更多关于
135135
a(target='_blank', rel='noopener external nofollow', href=`https://www.16personalities.com/ch/${mbti.mbti_text}-%E4%BA%BA%E6%A0%BC`)= mbti.name
136136
.image
137-
img.no-lightbox(src=mbti.image)
137+
#mbti-image
138+
script.
139+
$(document).ready(function() {
140+
lottie.loadAnimation({
141+
container: document.getElementById('mbti-image'),
142+
renderer: 'svg',
143+
loop: true,
144+
autoplay: true,
145+
path: "#{mbti.animation}"
146+
});
147+
});
138148
.author-content
139149
.author-content-item.buff
140150
.card-content

‎themes/butterfly/layout/includes/widget/card_mbti.pug‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,12 @@ style.
7171
position: absolute;
7272
right: 0px;
7373
top: 10px;
74-
width: 75px;
75-
transition: transform 2s cubic-bezier(.13, .45, .21, 1.02);
74+
width: 65px;
7675
opacity: 0.8;
7776
}
78-
.mbti .image img {
77+
.mbti .image #mbti-image {
7978
display: block;
8079
max-width: 100%;
81-
transition: filter 375ms ease-in .2s
82-
}
83-
.mbti:hover .image {
84-
transform: rotate(-10deg);
8580
}
8681

8782
- const mbtiMap = {E: '外倾', I: '内倾', S: '现实', N: '直觉', T: '理性', F: '感性', J: '有计划', P: '灵活'}
@@ -113,6 +108,16 @@ style.
113108
span= label1
114109
span= label2
115110
.image
116-
img(src=mbti.image alt=mbti.mbti_text)
111+
div(id="mbti-image")
117112
.mbti-date= `更新于：${mbti.update}`
118113

114+
script.
115+
$(document).ready(function() {
116+
lottie.loadAnimation({
117+
container: document.getElementById('mbti-image'),
118+
renderer: 'svg',
119+
loop: true,
120+
autoplay: true,
121+
path: "#{mbti.animation}"
122+
});
123+
});

‎themes/butterfly/source/css/_custom/about/about.css‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -318,25 +318,21 @@ p.p.center, span.p.center {
318318
}
319319
.author-content-item.personalities {
320320
position: relative;
321-
/* width: 59%; */
322321
width: 100%;
323322
height: 250px;
324323
}
325324

326325
.author-content-item.personalities .image {
327326
position: absolute;
328-
right: 30px;
327+
right: 0;
329328
top: 10px;
330-
transition: transform 2s cubic-bezier(0.13, 0.45, 0.21, 1.02);
329+
height: 230px;
330+
width: 230px;
331331
}
332-
.author-content-item.personalities .image img {
332+
.author-content-item.personalities .image #mbti-image {
333333
display: block;
334334
margin: 0 auto 20px;
335335
height: 230px;
336-
transition: filter 375ms ease-in 0.2s;
337-
}
338-
.author-content-item.personalities:hover .image {
339-
transform: rotate(-10deg);
340336
}
341337
.author-content-item:hover .card-background-icon {
342338
transform: rotate(20deg);
@@ -384,13 +380,7 @@ p.p.center, span.p.center {
384380
}
385381
.author-content-item.selfInfo {
386382
display: flex;
387-
/* max-height: 140px; */
388-
/* justify-content: space-between; */
389383
align-items: center;
390-
/* flex-wrap: wrap; */
391-
/* height: -webkit-fill-available; */
392-
/* min-height: 140px; */
393-
/* min-height: 140px; */
394384
height: calc(40% - 20px);
395385
}
396386
.author-content-item.selfInfo div {
@@ -605,6 +595,7 @@ p.p.center, span.p.center {
605595
}
606596
.post-tips {
607597
left: auto;
598+
z-index: 1;
608599
}
609600
.site-card-group > a {
610601
width: 100% !important;

0 commit comments

Comments
 (0)