zeekling
/
bolo-fantastic
1
1
Fork 0
Code Issues 1 Pull Requests Releases 4 Wiki Activity

Compare commits

base: zeekling:v1.2
Branches Tags
zeekling:master
zeekling:v1.3
zeekling:v1.2
zeekling:v1.1
zeekling:v1.0
...
compare: zeekling:master
Branches Tags
zeekling:master
zeekling:v1.3
zeekling:v1.2
zeekling:v1.1
zeekling:v1.0

10 Commits
v1.2 ... master

Author SHA1 Message Date
LingZhaoHui 2a87292803 Merge pull request '作业列表显示图片' (#11) from tupian into master 
Reviewed-on: #11
 2023-05-14 14:37:21 +00:00
LingZhaoHui 8c9bc8c627
作业列表显示图片 2023-05-14 22:36:44 +08:00
LingZhaoHui f9b2d1aa3c 删除文章图片和友联的图片 2022-12-11 20:02:51 +08:00
LingZhaoHui f1275b0d1a 修改模棱两可的 Unicode 字符 2022-12-04 16:49:17 +08:00
LingZhaoHui f1433eeea0 修改模棱两可的 Unicode 字符 2022-12-04 16:47:47 +08:00
LingZhaoHui 62d4f0b7d6 修改评论默认图片 2022-12-04 14:00:39 +08:00
LingZhaoHui a36e95a349 update articles 2022-07-09 15:46:52 +08:00
LingZhaoHui d2416aea0b del pic in index 2022-07-02 14:00:13 +08:00
LingZhaoHui b5f58e9173 修复手机文章样式 2022-04-20 20:28:23 +08:00
LingZhaoHui 5dd8f434a1 更新央视 2022-02-06 00:17:31 +08:00
8 changed files with 46 additions and 75 deletions
Show Stats Expand all files Collapse all files

8
README.md
View File

@ -1,22 +1,22 @@
## 简介 ## 简介
此项目是本人对bolo-fantastic进行了一些改造，包括样式和seo两方面。 此项目是本人对bolo-fantastic进行了一些改造,包括样式和seo两方面。
个人站点：[小令童鞋](https://www.zeekling.cn/) 个人站点：[小令童鞋](https://www.zeekling.cn/)
## 使用 ## 使用
- 将本项目下载到：`/dockerData/bolo/bolo-fantastic`下面 - 将本项目下载到: `/dockerData/bolo/bolo-fantastic`下面
- 将[https://git.zeekling.cn/linux/dockerFiles/src/branch/master/bolo](https://git.zeekling.cn/linux/dockerFiles/src/branch/master/bolo) - 将[https://git.zeekling.cn/linux/dockerFiles/src/branch/master/bolo](https://git.zeekling.cn/linux/dockerFiles/src/branch/master/bolo)
下面的dockerFiles和 settings.xml放置到博客bolo-solo的下面，执行下面命令编译并导出镜像： 下面的dockerFiles和 settings.xml放置到博客bolo-solo的下面,执行下面命令编译并导出镜像:
```sh ```sh
docker build -t "zeek/bolo" . docker build -t "zeek/bolo" .
docker save -o /tmp/zeek_bolo.tar zeek/bolo docker save -o /tmp/zeek_bolo.tar zeek/bolo
``` ```
- 将`/tmp/zeek_bolo.tar`上传到服务器`/tmp`目录下面，并且导入： - 将`/tmp/zeek_bolo.tar`上传到服务器`/tmp`目录下面,并且导入:
```sh ```sh
docker load --input=/tmp/zeek_bolo.tar docker load --input=/tmp/zeek_bolo.tar
``` ```

33
article-list.ftl
View File

@ -56,16 +56,16 @@
href="/category/${article.categoryURI}">${article.articleCategory}</a></h1> href="/category/${article.categoryURI}">${article.articleCategory}</a></h1>
</#if> </#if>
</div> </div>
<h2 class="blog-slider__title "><a class="title is-5" <h2 class="blog-slider__title "><a class="title is-6"
href="${article.articlePermalink}">${article.articleTitle!}</a> href="${article.articlePermalink}">${article.articleTitle!}</a>
</h2> </h2>
<div class="blog-slider__text" content=""> <div class="blog-slider__text is-size-6" content="" >
<#if article.articleAbstractText!?length gt 40> <#if article.articleAbstractText!?length gt 48>
${article.articleAbstractText!?substring(0, 40)} ......<#else> ${article.articleAbstractText!?substring(0, 48)} <#else>
${article.articleAbstractText!}</#if> ${article.articleAbstractText!}</#if>
</div> </div>
<a href="${article.articlePermalink}" <a href="${article.articlePermalink}"
class="blog-slider__button">阅读更多</a> class="button is-size-7 is-light">阅读更多</a>
</div> </div>
</div> </div>
</div> </div>
@ -76,7 +76,7 @@
<div class="card"> <div class="card">
<div class="card-image"> <div class="card-image">
<a href="${article.articlePermalink}"> <a href="${article.articlePermalink}">
<img class="thumbnail" src="${adminUser.userAvatar!}" height="250" width="150" <img class="thumbnail" src="${adminUser.userAvatar!}" height="200" width="100"
data-src="${article.articleImg1URL}" alt="${article.articleTitle!}" data-src="${article.articleImg1URL}" alt="${article.articleTitle!}"
referrerpolicy="origin"> referrerpolicy="origin">
</a> </a>
@ -102,16 +102,13 @@
</div> </div>
</div> </div>
<h2 class="title is-size-5 is-size-5-mobile has-text-weight-normal"> <h2 class="title is-size-5 is-size-5-mobile has-text-weight-normal">
<a class="has-link-black-ter" href="${article.articlePermalink}">${article.articleTitle!}</a>
<a class="has-link-black-ter"
href="${article.articlePermalink}">${article.articleTitle!}</a>
</h2> </h2>
<div id="is-hidden-touch" class="content is-hidden-touch"> <div id="is-hidden-touch" class="content is-hidden-touch is-size-6">
<#if article.articleAbstractText!?length gt 128> <#if article.articleAbstractText!?length gt 128>
${article.articleAbstractText!?substring(0, 128)} ......<#else> ${article.articleAbstractText!?substring(0, 110)} <#else>
${article.articleAbstractText!}</#if> ${article.articleAbstractText!}</#if>
<#-- ${article.articleAbstractText!?substring(0, 128)} ...... --> <#-- ${article.articleAbstractText!?substring(0, 110)} ...... -->
</div> </div>
<div class="level is-mobile"> <div class="level is-mobile">
@ -126,8 +123,6 @@
</div> </div>
</#if> </#if>
@ -166,3 +161,11 @@
</nav> </nav>
</div> </div>
</div> </div>
<style type="text/css">
.blog-slider__img {
margin-left: 20px;
width: 240px;
height: 150px;
}
</style>

9
article.ftl
View File

@ -48,7 +48,11 @@
<script src='https://www.zeekling.cn/cdn/js/swiper.min.js'></script> <script src='https://www.zeekling.cn/cdn/js/swiper.min.js'></script>
</@head> </@head>
<style type="text/css"> <style type="text/css">
.columns {
margin-left: 0.25rem;
margin-right: -0.75rem;
margin-top: -0.75rem;
}
</style> </style>
<#-- <#include "style.theme.ftl"> --> <#-- <#include "style.theme.ftl"> -->
</head> </head>
@ -101,8 +105,7 @@
height: 25px !important; height: 25px !important;
} }
</style> </style>
<div id="post-article" class="content post-article" <div id="post-article" class="content post-article" >
data-img="${article.articleImg1URL}">
${article.articleContent} ${article.articleContent}
</div> </div>
<div class="level is-size-7 is-uppercase"> <div class="level is-size-7 is-uppercase">

11
footer.ftl
View File

@ -17,6 +17,17 @@
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
--> -->
<style type="text/css">
.container {
max-width: 1280px;
}
.media-comment .media-content {
max-width: 240px;
max-height: 130px;
}
</style>
<footer class="footer"> <footer class="footer">
<div class="container"> <div class="container">
<div class="level footer_main"> <div class="level footer_main">

10
links.ftl
View File

@ -47,7 +47,7 @@
width:49%; width:49%;
text-align: center; text-align: center;
background-color:#F8F8F8; background-color:#F8F8F8;
height:160px; height:90px;
padding: 5px; padding: 5px;
border-radius:10px; border-radius:10px;
border: 0; border: 0;
@ -136,14 +136,6 @@
<div> <div>
<#list links as link> <#list links as link>
<div class="link-body"> <div class="link-body">
<div class="link-avatar-div">
<a href="${link.linkAddress}" rel="nofollow"
target="_blank">
<img alt="${link.linkDescription}"
src="${link.linkIcon}"
class="link-avatar">
</a>
</div>
<div class="link-contain-main"> <div class="link-contain-main">
<div class="link-meta"> <div class="link-meta">
<div itemprop="author" <div itemprop="author"

3
macro-comments.ftl
View File

@ -569,8 +569,7 @@
<section role="form" class="comment-editor"> <section role="form" class="comment-editor">
<div class="inner"> <div class="inner">
<div class="commentator"> <div class="commentator">
<img src="https://img.zeekling.cn/images/2021/09/25/674dd6f711c66ec631a05c00a21a080a.png" <img src="https://pan.zeekling.cn/cdn/images/comment.png" class="avatar">
class="avatar">
</div> </div>
<form class="comment-form"> <form class="comment-form">
<div class="author-info"> <div class="author-info">

24
side-right.ftl
View File

@ -45,31 +45,11 @@
<#list mostViewCountArticles as article> <#list mostViewCountArticles as article>
<article class="media"> <article class="media">
<#if article.articleImg1URL?? && article.articleImg1URL!=''>
<a href="${article.articlePermalink}" class="media-left">
<p class="image is-64x64">
<img class="thumbnail" src="${adminUser.userAvatar!}"width="48" height="48"
data-src="${article.articleImg1URL!}" alt="${article.articleTitle!}">
</p>
</a>
</#if>
<div class="media-content"> <div class="media-content">
<div class="content"> <div class="content">
<div style="padding-top: 10px;"> <div style="padding-top: 10px;padding-left:20px;" >
<a href="${article.articlePermalink}" class="">${article.articleTitle!}</a>
<div class="has-text-grey is-size-7 is-uppercase">
<#assign viewCountStr=article.articleViewCount?string('#.###')/>
<#if viewCountStr?length gt 3>
<#assign viewCount=viewCountStr?number/>
<#assign viewCountK=viewCount/1000 />
${viewCountK?string('#.##')}K 浏览
<#else>
${article.articleViewCount}浏览
</#if>
</div>
</div> </div>
<a href="${article.articlePermalink}"
class="title has-link-black-ter is-size-6 has-text-weight-normal">${article.articleTitle!}</a>
</div> </div>
</div> </div>
</article> </article>

23
side.ftl
View File

@ -24,10 +24,10 @@
<nav class="level"> <nav class="level">
<div class="level-item has-text-centered" style="flex-shrink: 1"> <div class="level-item has-text-centered" style="flex-shrink: 1">
<div class="level"> <div class="level">
<figure class="image is-64x64 has-mb-6 level-left" style="margin: 0 auto"> <!-- <figure class="image is-64x64 has-mb-6 level-left" style="margin: 0 auto">
<img class="is-rounded" src="${faviconURL}" alt="${blogTitle!}" height="48" width="48" <img class="is-rounded" src="${faviconURL}" alt="${blogTitle!}" height="48" width="48"
style="padding: 2px; box-shadow: 0 1px 2px 0 rgba(0,0,0,0.1);"> style="padding: 2px; box-shadow: 0 1px 2px 0 rgba(0,0,0,0.1);">
</figure> </figure> -->
<div class="level-right"> <div class="level-right">
<div> <div>
</div> </div>
@ -123,15 +123,7 @@
</div> </div>
<#list recentComments as comment> <#list recentComments as comment>
<article class="media media-comment"> <article class="media media-comment">
<a href="${comment.commentSharpURL}" class="media-left"> <div class="media-content" style="padding-left:20px;">
<p class="image is-48x48">
<img class="thumbnail" src="${adminUser.userAvatar!}"
data-src="${comment.commentThumbnailURL}"
alt="${comment.commentName}">
</p>
</a>
<div class="media-content">
<div class="content">
<div style="padding-top: 10px;padding-right:10px;"> <div style="padding-top: 10px;padding-right:10px;">
<div class="has-text-grey is-size-7 is-uppercase"> <div class="has-text-grey is-size-7 is-uppercase">
<a href="${comment.commentURL}" rel="nofollow" target="_black"> <a href="${comment.commentURL}" rel="nofollow" target="_black">
@ -143,7 +135,6 @@
<a href="${comment.commentSharpURL}" <a href="${comment.commentSharpURL}"
class="title has-link-black-ter is-size-6 class="title has-link-black-ter is-size-6
has-text-weight-normal" style="background-color:#f7f7f7 !important;"> ${comment.commentContent}</a> has-text-weight-normal" style="background-color:#f7f7f7 !important;"> ${comment.commentContent}</a>
</div>
</div> </div>
</article> </article>
</#list> </#list>
@ -178,14 +169,6 @@
</div> </div>
<#list mostViewCountArticles as article> <#list mostViewCountArticles as article>
<article class="media"> <article class="media">
<#if article.articleImg1URL?? && article.articleImg1URL!=''>
<a href="${article.articlePermalink}" class="media-left">
<p class="image is-64x64">
<img class="thumbnail" src="${adminUser.userAvatar!}" data-src="${article.articleImg1URL!}"
alt="${article.articleTitle!}">
</p>
</a>
</#if>
<div class="media-content"> <div class="media-content">
<div class="content"> <div class="content">
<div style="padding-top: 10px;"> <div style="padding-top: 10px;">