From 27b19b392d04734d70ba60616063b8603f0677d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=B5=B5=E5=90=8C=E5=AD=A6?= <94612053+imzql@users.noreply.github.com> Date: Fri, 26 Jul 2024 11:24:34 +0800 Subject: [PATCH] =?UTF-8?q?2024.7.26=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.修复文章字数显示bug 2.修改了上下页翻页的割裂感 3.修改为新版友联样式 --- hugo.toml | 4 +- themes/Ying/data/links.yaml | 330 +++++++++++-------- themes/Ying/hugo.toml | 2 + themes/Ying/layouts/_default/home.html | 11 +- themes/Ying/layouts/_default/single.html | 2 +- themes/Ying/layouts/partials/footer.html | 58 ++-- themes/Ying/layouts/partials/link_items.html | 11 +- themes/Ying/static/css/light.css | 129 +++++--- 8 files changed, 309 insertions(+), 238 deletions(-) diff --git a/hugo.toml b/hugo.toml index 9a8a1032..0d4d6188 100644 --- a/hugo.toml +++ b/hugo.toml @@ -3,4 +3,6 @@ languageCode = 'zh-cn' title = '优世界' theme = 'Ying' # 分页展示文章数 每页展示文章的数量 -paginate = 5 \ No newline at end of file +paginate = 5 +#计算文章总字数 +HasCJKLanguage = true diff --git a/themes/Ying/data/links.yaml b/themes/Ying/data/links.yaml index a161758d..1f5759e8 100644 --- a/themes/Ying/data/links.yaml +++ b/themes/Ying/data/links.yaml @@ -1,141 +1,189 @@ -- url: "https://blog.keepke.com" - title: "保持思考与理性" - name: "吾柯" -- url: "https://qq.md" - title: "福建三明尤溪人士" - name: "叶开" -- url: "https://loseu.cc" - title: "愿陪你慢慢长大" - name: "强仔" -- url: "https://yang99.fun" - title: "感谢相识" - name: "一泽" -- url: "https://qydzz.cn" - title: "用文字记录那些时间带走的东西" - name: "七栀" -- url: "https://www.rz.sb" - title: "一个若志的网络自留地" - name: "若志随笔" -- url: "https://heitaosan.com" - title: "逆着光行走,任风吹雨打" - name: "黑桃三" -- url: "https://blog.allnull.cn" - title: "别让世俗淹没了生活" - name: "十七的小栈" -- url: "https://vian.top" - title: "想要的都拥有,得不到的都释怀!" - name: "Vian" -- url: "https://www.200011.net" - title: "A website for myself" - name: "油油" -- url: "https://www.dawuyu.com" - title: "假如没有假如,如果没有如果" - name: "大悟博客" -- url: "https://www.sunjianjian.com" - title: "总会有温柔的人愿意站在你能看见的地方。" - name: "Sun's Blog" -- url: "https://duanxiansen.com" - title: "迄今所有人生都大写着失败,但并不妨碍我继续向前" - name: "段先森" -- url: "https://blog.fivk.cn" - title: "相逢的人会再相逢" - name: "Fivk博客" -- url: "https://www.logyu.cc" - title: "记录生活为忆,平地小山为屿" - name: "日志屿" -- url: "https://baipin.pw" - title: "我欲穿花寻路,直入白云深处,浩气展虹霓" - name: "百品博客" -- url: "https://cacx.cc" - title: "有关于成长、生活与情感" - name: "长安城下" -- url: "https://dyfa.top" - title: "十万伏特皮卡丘,梦想是世界和平,想要发光发热" - name: "itsNekoDeng" -- url: "https://www.baifan97.cn" - title: "一个斜杠青年的碎碎念" - name: "WhiteFan" -- url: "https://beifeng.me" - title: "记录一个人的生活点滴" - name: "北枫" -- url: "https://t-t.live" - title: "爱生活 爱分享" - name: "团团生活志" -- url: "https://mua.ooo" - title: "一 个 古 精 灵 怪" - name: "呆呆怪" -- url: "https://huziyan.com" - title: "臭袜子" - name: "臭袜子" -- url: "https://www.yuezeyi.com" - title: "我们历经苦难,我们生生不息" - name: "岳泽以" -- url: "https://www.fllv.cn" - title: "记录生活" - name: "三石的记录" -- url: "https://mojinxi.cn" - title: "相视而笑,莫逆于心。" - name: "竹春廿柒" -- url: "https://www.sirit.com.cn" - title: "真正的幸福在于对平淡生活的热爱" - name: "大嘴狗狗" -- url: "https://sweetjing.cc/" - title: "一切都会好起来,然后走向正轨,保持热爱,奔赴山海。" - name: "半截の诗" -- url: "https://vimin.cc" - title: "记录生活点滴,谱写精彩生活!" - name: "XIAOMING'S BLOG" -- url: "https://xyzbz.cn" - title: "一个九三年的老青年" - name: "网友小宋" -- url: "https://blog.zyyo.net" - title: "热烈而自由" - name: "zyyo笔记" -- url: "https://sumiler.com" - title: "微风轻轻起 夏日不再来" - name: "微风忆夏" -- url: "https://www.xiaozonglin.cn" - title: "一位来自福建泉州的高中生" - name: "林林杂语" -- url: "https://www.bio-w.cn" - title: "我在人间贩卖彩虹" - name: "西瓜撞地球" -- url: "https://te.ink" - title: "愿山野浓雾都有路灯风..." - name: "Teink" -- url: "https://www.eacls.top" - title: "看一看世界的繁华" - name: "Eacls" -- url: "https://blog.krisyan.dev" - title: "無限進步 @Schale夏萊" - name: "Kris Yan" -- url: "http://liuyuyang.net" - title: "记录一个架构师的崛起" - name: "YuYang" -- url: "https://www.liveout.cn/" - title: "漂泊于互联网中的小窝" - name: "Echo 的小窝" -- url: "https://felixway.cn" - title: "漂泊于互联网中的小窝" - name: "未来往事" -- url: "https://ihello.cc" - title: "心存阳光,必有诗和远方" - name: "小稚生活志" -- url: "https://whooc.com" - title: "寒冻三尺非此界,烈日焦灼正午时!" - name: "风呼呼" -- url: "https://www.liuchengrui.cn" - title: "其实我是一个假柳橙" - name: "柳橙睿" -- url: "https://likaijian.com" - title: "留下瞬间,记录永恒" - name: "永恒末匕" -- url: "https://yjvc.cn/" - title: "一个积极向上的生活探索者!" - name: "刘郎阁" -- url: "https://www.fcln.net" - title: "借一点落日的光与来日方长" - name: "浮沉流年" -- url: "https://www.landiaoshike.com/" - title: "天在将暗未暗时最美 爱在将爱未爱时最迷人" - name: "蓝调时刻" +blogs: + - name: 吾柯 + url: https://blog.keepke.com + description: 保持思考与理性 + image: https://blog.keepke.com/logo.png + - name: 叶开 + url: https://qq.md + description: 福建三明尤溪人士 + image: https://cravatar.cn/avatar/4741124456fb02fa4da30494dbc6c99e?d=monsterid&s=80 + - name: 强仔 + url: https://loseu.cc + description: 愿陪你慢慢长大 + image: https://q1.qlogo.cn/g?b=qq&nk=1724417279@qq.com&s=100 + - name: 一泽 + url: https://yang99.fun + description: 感谢相识 + image: https://q.qlogo.cn/g?b=qq&nk=3369963811@qq.com&s=100 + - name: 七栀 + url: https://qydzz.cn + description: 用文字记录那些时间带走的东西 + image: https://qydzz.cn/logo.png + - name: 若志随笔 + url: https://www.rz.sb + description: 一个若志的网络自留地 + image: https://q1.qlogo.cn/g?b=qq&nk=80360650&s=640 + - name: 黑桃三 + url: https://heitaosan.com + description: 逆着光行走,任风吹雨打 + image: https://s2.ax1x.com/2020/01/03/lUmf81.png + - name: 十七的小栈 + url: https://blog.allnull.cn + description: 别让世俗淹没了生活 + image: https://cravatar.cn/avatar/56238a7f177c534928fd3cf4161ab59e?s=65&r=G&d=mm + - name: Vian + url: https://vian.top + description: 想要的都拥有,得不到的都释怀! + image: https://www.vian.top/avatar.ico + - name: 油油 + url: https://www.200011.net + description: A website for myself + image: https://q1.qlogo.cn/g?b=qq&nk=1376652515&s=640 + - name: 大悟博客 + url: https://www.dawuyu.com + description: 假如没有假如,如果没有如果 + image: https://q1.qlogo.cn/g?b=qq&nk=2824236078&s=640 + - name: Sun's Blog + url: https://www.sunjianjian.com + description: 总会有温柔的人愿意站在你能看见的地方。 + image: https://cdn.sunjianjian.com/tx.png + - name: 段先森 + url: https://duanxiansen.com + description: 迄今所有人生都大写着失败,但并不妨碍我继续向前 + image: https://q.qlogo.cn/g?b=qq&nk=2443266417@qq.com&s=100 + - name: Fivk博客 + url: https://blog.fivk.cn + description: 相逢的人会再相逢 + image: https://q1.qlogo.cn/g?b=qq&nk=11470226&s=640 + - name: 日志屿 + url: https://www.logyu.cc + description: 记录生活为忆,平地小山为屿 + image: https://p.logyu.cc/logo.png + - name: 百品博客 + url: https://baipin.pw + description: 我欲穿花寻路,直入白云深处,浩气展虹霓 + image: https://www.baipin.pw/wp-content/uploads/2019/07/cropped-ABUIABACGAAg_bP2wwUorbiplQQwgAU4gAU.jpg + - name: 长安城下 + url: https://cacx.cc + description: 有关于成长、生活与情感 + image: https://sdn.geekzu.org/avatar/8013fe55bd756cb345d686797cf8d090? + - name: itsNekoDeng + url: https://dyfa.top + description: 十万伏特皮卡丘,梦想是世界和平,想要发光发热 + image: https://dyfa.top/medias/avatar.jpg + - name: WhiteFan + url: https://www.baifan97.cn + description: 一个斜杠青年的碎碎念 + image: https://ypy.baifan97.cn/typecho/uploads/img/avatar.png + - name: 北枫 + url: https://beifeng.me + description: 记录一个人的生活点滴 + image: https://q1.qlogo.cn/g?b=qq&nk=41777657&s=640 + - name: 团团生活志 + url: https://t-t.live + description: 爱生活 爱分享 + image: https://t-t.live/images/tx.png + - name: 呆呆怪 + url: https://mua.ooo + description: 一 个 古 精 灵 怪 + image: https://mua.ooo/Mua.OoO.jpg + - name: 臭袜子 + url: https://huziyan.com + description: 臭袜子 + image: https://cbu.cc/favicon.ico + - name: 岳泽以 + url: https://www.yuezeyi.com + description: 我们历经苦难,我们生生不息 + image: https://pic.zeyiwl.cn/yunimg/20220102174507.jpg + - name: 三石的记录 + url: https://www.fllv.cn + description: 记录生活 + image: https://cdn.helingqi.com/wavatar/a25a7640aa68e6d26e32afee8120f7e5?s=65&r=G&d= + - name: 竹春廿柒 + url: https://mojinxi.cn + description: 相视而笑,莫逆于心。 + image: https://mojinxi.cn/img/logo.png + - name: 大嘴狗狗 + url: https://www.sirit.com.cn + description: 真正的幸福在于对平淡生活的热爱 + image: https://www.sirit.com.cn/siritlogo.png + - name: 半截の诗 + url: https://sweetjing.cc/ + description: 一切都会好起来,然后走向正轨,保持热爱,奔赴山海。 + image: https://q1.qlogo.cn/g?b=qq&nk=1486823198&s=640 + - name: XIAOMING'S BLOG + url: https://vimin.cc + description: 记录生活点滴,谱写精彩生活! + image: https://pic.vimin.cc/logo.png + - name: 网友小宋 + url: https://xyzbz.cn + description: 一个九三年的老青年 + image: https://img.xyzbz.cn/i/2022/05/20/62870d1504cc7.png + - name: zyyo笔记 + url: https://blog.zyyo.net + description: 热烈而自由 + image: https://q.qlogo.cn/g?b=qq&nk=3509679579&s=100 + - name: 微风忆夏 + url: https://sumiler.com + description: 微风轻轻起 夏日不再来 + image: https://cravatar.cn/avatar//a35f5ef7a4bce3b7cfa6f538ffcae7aa + - name: 林林杂语 + url: https://www.xiaozonglin.cn + description: 一位来自福建泉州的高中生 + image: https://cravatar.cn/avatar/04bfc914bd50b42eb507bf66aad0cc31?d=mp + - name: 西瓜撞地球 + url: https://www.bio-w.cn + description: 我在人间贩卖彩虹 + image: https://bu.dusays.com/2022/10/17/634d313602a1e.png + - name: Teink + url: https://te.ink + description: 愿山野浓雾都有路灯风... + image: https://q1.qlogo.cn/g?b=qq&nk=763333529&s=100 + - name: Eacls + url: https://www.eacls.top + description: 看一看世界的繁华 + image: https://www.eacls.top/img/favicon.png + - name: Kris Yan + url: https://blog.krisyan.dev + description: 無限進步 @Schale夏萊 + image: https://cravatar.cn/avatar/05729ab2ca3b99203a674859f77d592b?&d=mp + - name: YuYang + url: http://liuyuyang.net + description: 记录一个架构师的崛起 + image: http://q1.qlogo.cn/g?b=qq&nk=3311118881&s=640 + - name: Echo 的小窝 + url: https://www.liveout.cn/ + description: 漂泊于互联网中的小窝 + image: https://yy.liveout.cn/photo/photo2.jpg + - name: 未来往事 + url: https://felixway.cn + description: 漂泊于互联网中的小窝 + image: https://cravatar.cn/avatar/2ee35215cbea58cd8b2605e7f517d689?&d=mp + - name: 小稚生活志 + url: https://ihello.cc + description: 心存阳光,必有诗和远方 + image: https://bu.dusays.com/2024/02/02/65bbce27b129a.jpg + - name: 风呼呼 + url: https://whooc.com + description: 寒冻三尺非此界,烈日焦灼正午时! + image: https://whooc.com/logo + - name: 柳橙睿 + url: https://www.liuchengrui.cn + description: 其实我是一个假柳橙 + image: https://www.liuchengrui.cn/myphoto.png + - name: 永恒末匕 + url: https://likaijian.com + description: 留下瞬间,记录永恒 + image: https://q.qlogo.cn/headimg_dl?dst_uin=1527335101&spec=640 + - name: 刘郎阁 + url: https://yjvc.cn/ + description: 一个积极向上的生活探索者! + image: https://yjvc.cn/usr/uploads/logo.jpeg + - name: 浮沉流年 + url: https://www.fcln.net + description: 借一点落日的光与来日方长 + image: https://www.ifonce.com/wp-content/uploads/2024/02/20240201200905925-IMG_4296.jpeg + - name: 蓝调时刻 + url: https://www.landiaoshike.com/ + description: 天在将暗未暗时最美 爱在将爱未爱时最迷人 + image: https://www.landiaoshike.com/favicon.ico \ No newline at end of file diff --git a/themes/Ying/hugo.toml b/themes/Ying/hugo.toml index 6d5060a2..3c222768 100644 --- a/themes/Ying/hugo.toml +++ b/themes/Ying/hugo.toml @@ -18,6 +18,8 @@ description = "风吹云散,云卷云舒" # 分页展示文章数 每页展示文章的数量 paginate = 5 +hasCJKLanguage = true + # 社交链接列表 social = [ # GitHub 链接和图标 diff --git a/themes/Ying/layouts/_default/home.html b/themes/Ying/layouts/_default/home.html index 867c6ff6..79b74e6b 100644 --- a/themes/Ying/layouts/_default/home.html +++ b/themes/Ying/layouts/_default/home.html @@ -15,16 +15,17 @@ {{ end }} diff --git a/themes/Ying/layouts/_default/single.html b/themes/Ying/layouts/_default/single.html index d8d777bc..336b1d38 100644 --- a/themes/Ying/layouts/_default/single.html +++ b/themes/Ying/layouts/_default/single.html @@ -3,7 +3,7 @@

{{ .Title }}

- 作者: 小赵同学 浏览: {{ .Params.views }} 字数: {{ .WordCount }} 分类: + 作者: 小赵同学 浏览: {{ .Params.views }} 字数: {{ .WordCount }} 分类: {{ range .Params.categories }} {{ . }} {{ end }} diff --git a/themes/Ying/layouts/partials/footer.html b/themes/Ying/layouts/partials/footer.html index 23a782bf..66e9dcc7 100644 --- a/themes/Ying/layouts/partials/footer.html +++ b/themes/Ying/layouts/partials/footer.html @@ -1,15 +1,15 @@
@@ -22,24 +22,24 @@ + import { init as walineInit } from 'https://unpkg.com/@waline/client@v3/dist/waline.js'; + + window.walineInit = walineInit; + + window.initWaline = function() { + walineInit({ + el: '#waline', + serverURL: 'https://waline.usj.cc', + lang:"zh-cn", + imageUploader:false, + search:false, + copyright:false + }); + }; + + // Initial load + window.initWaline(); + \ No newline at end of file diff --git a/themes/Ying/layouts/partials/link_items.html b/themes/Ying/layouts/partials/link_items.html index f0665e90..e4d4e771 100644 --- a/themes/Ying/layouts/partials/link_items.html +++ b/themes/Ying/layouts/partials/link_items.html @@ -1,9 +1,6 @@ -{{ range .Site.Data.links }} -