This commit is contained in:
Van 2019-08-26 11:48:58 +08:00
parent 739fb30584
commit 65343c5618
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
11 changed files with 192 additions and 134 deletions

File diff suppressed because one or more lines are too long

View File

@ -350,6 +350,7 @@
position: fixed;
top: 90px;
bottom: 60px;
width: 260px;
a {
color: rgba(0, 0, 0, 0.54);
@ -866,4 +867,4 @@
#nprogress .spinner-icon {
border-top-color: #d23f31;
border-left-color: #d23f31;
}
}

View File

@ -19,8 +19,8 @@
-->
<#list articles as article>
<article>
<header>
<h2>
<header class="fn__flex">
<h2 class="fn__flex-1">
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
@ -42,14 +42,33 @@
<section class="abstract vditor-reset">
${article.articleAbstract}
</section>
<footer class="tags">
<span class="icon-tag"></span> &nbsp;
<#list article.articleTags?split(",") as articleTag>
<a class="tag" rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}</a>
</#list>
<a rel="nofollow" href="${servePath}/authors/${article.authorId}">
<footer class="article__footer fn__flex">
<span class="icon-tag fn__flex-center"></span>
<span>&nbsp;&nbsp;&nbsp;</span>
<div class="tags fn__flex-1 fn__flex-center">
<#list article.articleTags?split(",") as articleTag>
<a class="tag" rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}</a>
</#list>
</div>
<span>&nbsp;&nbsp;&nbsp;</span>
<#if article.articleCommentCount != 0>
<a href="${servePath}${article.articlePermalink}#comments"
class="vditor-tooltipped__n vditor-tooltipped link fn__flex-center"
aria-label="${commentLabel}">
${article.articleCommentCount}
<span class="icon-chat"></span>
</a>
</#if>
<#if article.articleViewCount != 0>
<a class="vditor-tooltipped__n vditor-tooltipped link fn__flex-center"
href="${servePath}${article.articlePermalink}"
aria-label="${viewLabel}">
${article.articleViewCount}
<span class="icon-views"></span>
</a>
</#if>
<a rel="nofollow" href="${servePath}/authors/${article.authorId}" class="fn__flex-center">
<img class="avatar" title="${article.authorName}" alt="${article.authorName}" src="${article.authorThumbnailURL}"/>
</a>
</footer>
@ -74,4 +93,4 @@
<a href="${servePath}${path}?p=${paginationNextPageNum}" class="extend">${nextPagePabel}</a>
</#if>
</nav>
</#if>
</#if>

View File

@ -22,111 +22,134 @@
<#include "../../common-template/macro-comment_script.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${article.articleTitle} - ${blogTitle}" description="${article.articleAbstract?html}">
<link rel="stylesheet"
href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
<head>
<@head title="${article.articleTitle} - ${blogTitle}" description="${article.articleAbstract?html}">
<link rel="stylesheet"
href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
<#if previousArticlePermalink??>
<link rel="prev" title="${previousArticleTitle}" href="${servePath}${previousArticlePermalink}">
</#if>
<#if nextArticlePermalink??>
<link rel="next" title="${nextArticleTitle}" href="${servePath}${nextArticlePermalink}">
</#if>
</@head>
</head>
<body>
<#include "side.ftl">
<main>
<article class="post vditor-reset">
<header>
<h2>
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
</h2>
<time><span class="icon-date"></span> ${article.articleCreateDate?string("yyyy-MM-dd")}</time>
</@head>
</head>
<body>
<#include "side.ftl">
<main>
<article class="post">
<header class="fn__flex">
<h2 class="fn__flex-1">
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
</h2>
<time><span class="icon-date"></span> ${article.articleCreateDate?string("yyyy-MM-dd")}</time>
</header>
<div class="article__footer fn__flex">
<span class="icon-tag fn__flex-center"></span>
<span>&nbsp;&nbsp;&nbsp;</span>
<div class="tags fn__flex-1 fn__flex-center">
<#list article.articleTags?split(",") as articleTag>
<a class="tag" rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}</a>
</#list>
</div>
<span>&nbsp;&nbsp;&nbsp;</span>
<#if article.articleCommentCount != 0>
<a href="${servePath}${article.articlePermalink}#comments"
class="vditor-tooltipped__n vditor-tooltipped link fn__flex-center"
aria-label="${commentLabel}">
${article.articleCommentCount}
<span class="icon-chat"></span>
</a>
</#if>
<#if article.articleViewCount != 0>
<a class="vditor-tooltipped__n vditor-tooltipped link fn__flex-center"
href="${servePath}${article.articlePermalink}"
aria-label="${viewLabel}">
${article.articleViewCount}
<span class="icon-views"></span>
</a>
</#if>
<a rel="nofollow" href="${servePath}/authors/${article.authorId}" class="fn__flex-center">
<img class="avatar" title="${article.authorName}" alt="${article.authorName}"
src="${article.authorThumbnailURL}"/>
</a>
</div>
<section class="tags">
<span class="icon-tag"></span> &nbsp;
<#list article.articleTags?split(",") as articleTag>
<a class="tag" rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}</a>
</#list>
<section class="abstract vditor-reset">
${article.articleContent}
<#if "" != article.articleSign.signHTML?trim>
<div>
${article.articleSign.signHTML}
</div>
</#if>
<a rel="nofollow" href="${servePath}/authors/${article.authorId}">
<img class="avatar prevent" title="${article.authorName}" alt="${article.authorName}" src="${article.authorThumbnailURL}"/>
<#if nextArticlePermalink?? || previousArticlePermalink??>
<aside class="fn__flex">
<#if previousArticlePermalink??>
<a class="fn__flex-1 fn__flex-inline" rel="prev" href="${servePath}${previousArticlePermalink}">
<strong>&lt;</strong>
<span>&nbsp; ${previousArticleTitle}&nbsp;&nbsp;&nbsp;</span>
</a>
</section>
</header>
<section class="abstract vditor-reset">
${article.articleContent}
<#if "" != article.articleSign.signHTML?trim>
<div>
${article.articleSign.signHTML}
</div>
</#if>
<#if nextArticlePermalink?? || previousArticlePermalink??>
<aside class="fn-clear">
<#if previousArticlePermalink??>
<a class="fn-left" rel="prev" href="${servePath}${previousArticlePermalink}">
<strong>&lt;</strong> ${previousArticleTitle}
<#if nextArticlePermalink??>
<a class="fn__flex-inline" rel="next" href="${servePath}${nextArticlePermalink}">
<span>${nextArticleTitle}&nbsp; </span>
<strong>&gt;</strong>
</a>
</#if>
<#if nextArticlePermalink??>
<a class="fn-right" rel="next" href="${servePath}${nextArticlePermalink}">
${nextArticleTitle} <strong>&gt;</strong>
</a>
</#if>
</aside>
</#if>
</section>
</aside>
</#if>
</section>
<footer class="fn-clear share">
<div class="fn-right">
<footer class="fn-clear share">
<div class="fn-right">
<span class="icon icon-wechat"
data-type="wechat"
data-title="${article.articleTitle}"
data-blogtitle="${blogTitle}"
data-url="${servePath}${article.articlePermalink}"
data-avatar="${article.authorThumbnailURL}"></span>
<span class="icon icon-weibo" data-type="weibo"></span>
<span class="icon icon-twitter" data-type="twitter"></span>
<span class="icon icon-qqz" data-type="qqz"></span>
</div>
</footer>
<#if 0 != relevantArticlesDisplayCount>
<div id="relevantArticles" class="abstract"></div>
</#if>
<#if 0 != randomArticlesDisplayCount>
<div id="randomArticles" class="abstract"></div>
</#if>
<#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount>
<div id="externalRelevantArticles" class="abstract"></div>
</#if>
</article>
<@comments commentList=articleComments article=article></@comments>
<span class="icon icon-weibo" data-type="weibo"></span>
<span class="icon icon-twitter" data-type="twitter"></span>
<span class="icon icon-qqz" data-type="qqz"></span>
</div>
</footer>
<#if 0 != relevantArticlesDisplayCount>
<div id="relevantArticles" class="abstract"></div>
</#if>
<#if 0 != randomArticlesDisplayCount>
<div id="randomArticles" class="abstract"></div>
</#if>
<#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount>
<div id="externalRelevantArticles" class="abstract"></div>
</#if>
<br>
</article>
<@comments commentList=articleComments article=article></@comments>
<#include "footer.ftl">
<#include "footer.ftl">
<@comment_script oId=article.oId commentable=article.commentable>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
<#if 0 != externalRelevantArticlesDisplayCount>
<@comment_script oId=article.oId commentable=article.commentable>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
<#if 0 != externalRelevantArticlesDisplayCount>
page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>");
</#if>
<#if 0 != randomArticlesDisplayCount>
</#if>
<#if 0 != randomArticlesDisplayCount>
page.loadRandomArticles();
</#if>
<#if 0 != relevantArticlesDisplayCount>
</#if>
<#if 0 != relevantArticlesDisplayCount>
page.loadRelevantArticles('${article.oId}', '<h4>${relevantArticles1Label}</h4>');
</#if>
Yilia.share()
</@comment_script>
</main>
</body>
</#if>
Yilia.share()
</@comment_script>
</main>
</body>
</html>

File diff suppressed because one or more lines are too long

View File

@ -250,11 +250,11 @@ pre code, pre tt {
/* start common */
@font-face {
font-family: 'icomoon';
src: url('fonts/icomoon.eot?nqk4b3');
src: url('fonts/icomoon.eot?nqk4b3#iefix') format('embedded-opentype'),
url('fonts/icomoon.ttf?nqk4b3') format('truetype'),
url('fonts/icomoon.woff?nqk4b3') format('woff'),
url('fonts/icomoon.svg?nqk4b3#icomoon') format('svg');
src: url('fonts/icomoon.eot?g8w5p');
src: url('fonts/icomoon.eot?g8w5p#iefix') format('embedded-opentype'),
url('fonts/icomoon.ttf?g8w5p') format('truetype'),
url('fonts/icomoon.woff?g8w5p') format('woff'),
url('fonts/icomoon.svg?g8w5p#icomoon') format('svg');
font-weight: normal;
font-style: normal;
}
@ -274,6 +274,22 @@ pre code, pre tt {
-moz-osx-font-smoothing: grayscale;
}
.icon-chat:before {
content: "\e906";
}
.icon-views:before {
content: "\e907";
}
.icon-github:before {
content: "\e900";
}
.icon-rss:before {
content: "\e901";
}
.icon-register:before {
content: "\e600";
}
@ -314,14 +330,6 @@ pre code, pre tt {
content: "\e905";
}
.icon-github:before {
content: "\e900";
}
.icon-rss:before {
content: "\e901";
}
.icon-wechat:before {
content: "\e903";
}
@ -505,9 +513,10 @@ pre code, pre tt {
}
.side .article__toc {
padding: 0;
padding: 30px 0 0 0;
height: 100%;
margin: 0;
box-sizing: border-box;
}
.side .toc .close {
@ -587,7 +596,7 @@ article header:hover {
article header h2 {
margin: 0;
font-size: 26px;
padding-right: 110px;
padding-right: 20px;
}
article header a {
@ -595,6 +604,7 @@ article header a {
margin-left: 0px;
font-weight: 300;
line-height: 35px;
word-break: break-all;
}
article header a:hover {
@ -622,10 +632,8 @@ article header sup {
article header time {
font-size: 14px;
position: absolute;
right: 30px;
color: #aaa;
top: 18px;
align-self: center;
}
article .abstract {
@ -636,10 +644,27 @@ article .abstract {
word-wrap: break-word
}
article footer {
padding: 20px 35px 0 0;
.article__footer {
padding: 20px 0 0 0;
margin: 30px 30px 20px 30px;
border-top: 1px solid #ddd;
.avatar {
float: left;
width: 20px;
border-radius: 15px;
transition: all 0.2s ease-out 0s;
}
.link {
color: #b0a0aa;
margin-right: 20px;
font-size: 14px;
&:hover {
color: rgba(0, 0, 0, 0.54);
}
}
}
.tags .tag:hover,
@ -647,15 +672,6 @@ article .abstract a:hover {
opacity: 0.7;
}
.tags .avatar {
width: 20px;
border-radius: 10px;
right: 30px;
position: absolute;
bottom: 25px;
transition: all 0.2s ease-out 0s;
}
.share {
.icon-wechat {
position: relative;
@ -674,7 +690,7 @@ article .abstract a:hover {
}
}
.tags .avatar:hover,
article footer .avatar:hover,
.share span:hover {
transform: rotate(360deg);
color: #333;
@ -797,18 +813,15 @@ article.post {
margin-top: 4px;
}
.post section.tags {
margin: 0;
}
.post header {
padding-bottom: 0;
}
.post .share {
padding: 10px 0 0 0;
margin-top: 15px;
font-size: 14px;
margin: 30px 30px 20px 30px;
border-top: 1px solid #ddd;
}
.post aside a {
@ -1036,4 +1049,4 @@ footer.footer .icon-goup:hover {
}
}
/* end responsive */
/* end responsive */

Binary file not shown.

View File

@ -20,4 +20,6 @@
<glyph unicode="&#xe903;" glyph-name="wechat" horiz-adv-x="1170" d="M331.429 687.428c0 31.429-20.571 52-52 52-30.857 0-62.286-20.571-62.286-52 0-30.857 31.429-51.429 62.286-51.429 31.429 0 52 20.571 52 51.429zM756 397.714c0 20.571-20.571 41.143-52 41.143-20.571 0-41.143-20.571-41.143-41.143 0-21.143 20.571-41.714 41.143-41.714 31.429 0 52 20.571 52 41.714zM621.143 687.428c0 31.429-20.571 52-51.429 52-31.429 0-62.286-20.571-62.286-52 0-30.857 30.857-51.429 62.286-51.429 30.857 0 51.429 20.571 51.429 51.429zM984 397.714c0 20.571-21.143 41.143-52 41.143-20.571 0-41.143-20.571-41.143-41.143 0-21.143 20.571-41.714 41.143-41.714 30.857 0 52 20.571 52 41.714zM832 624.571c-13.143 1.714-26.286 2.286-40 2.286-196.571 0-352-146.857-352-327.429 0-30.286 4.571-59.429 13.143-86.857-13.143-1.143-25.714-1.714-38.857-1.714-52 0-93.143 10.286-145.143 20.571l-144.571-72.571 41.143 124.571c-103.429 72.571-165.714 166.286-165.714 280 0 197.143 186.286 352 414.286 352 203.429 0 382.286-124 417.714-290.857zM1170.286 304c0-93.143-61.714-176-145.143-238.286l31.429-103.429-113.714 62.286c-41.714-10.286-83.429-21.143-124.571-21.143-197.143 0-352 134.857-352 300.571s154.857 300.571 352 300.571c186.286 0 352-134.857 352-300.571z" />
<glyph unicode="&#xe904;" glyph-name="tag" d="M725.354 714.688c0-29.44 23.894-53.334 53.334-53.334s53.334 23.894 53.334 53.334-23.894 53.334-53.334 53.334-53.334-23.894-53.334-53.334zM352.448-39.232c32.854-33.088 86.186-33.088 119.254 0l521.386 517.974c20.886 20.886 31.36 48.426 30.934 75.946v299.52c0 58.454-47.382 105.814-105.814 105.814h-299.52c-27.52 0.448-55.040-10.026-75.968-30.934l-517.952-521.408c-33.088-33.046-33.088-86.378 0-119.254l327.68-327.658zM640.022 714.688c0 76.586 62.080 138.666 138.666 138.666s138.666-62.080 138.666-138.666-62.080-138.666-138.666-138.666-138.666 62.080-138.666 138.666z" />
<glyph unicode="&#xe905;" glyph-name="date" d="M896 0h-768c-35.328 0-64 28.672-64 64v672c0 35.328 28.672 64 64 64h64v-32c0-53.024 42.976-96 96-96s96 42.976 96 96v32h256v-32c0-53.024 43.008-96 96-96s96 42.976 96 96v32h64c35.328 0 64-28.672 64-64v-672c0-35.328-28.672-64-64-64zM896 576h-768v-512h768v512zM418.208 325.472c6.304 10.048 9.472 20.672 9.472 31.776 0 24.736-13.312 37.12-39.936 37.12-23.136 0-45.248-9.184-66.368-27.552v52.128c23.36 15.136 49.76 22.688 79.136 22.688 27.488 0 48.96-6.912 64.416-20.704s23.168-32.48 23.168-55.968c0-31.36-18.816-63.808-56.448-97.312l-55.328-49.12v-1.12h109.12v-49.12h-176.992v46.112l77.056 73.696c15.488 14.848 26.4 27.296 32.704 37.376zM634.784 218.688c8.448 6.496 12.672 15.552 12.672 27.2 0 12-5.216 21.248-15.648 27.744s-24.768 9.76-43.040 9.76h-24.192v45.376h22.304c35.008 0 52.512 11.616 52.512 34.88 0 21.888-13.44 32.8-40.32 32.8-17.984 0-35.488-5.824-52.512-17.44v48.384c18.88 9.504 40.864 14.24 65.984 14.24 27.488 0 48.896-6.176 64.224-18.56s22.976-28.448 22.976-48.192c0-35.136-17.824-57.12-53.44-65.984v-0.928c19.008-2.368 33.984-9.28 44.992-20.704s16.512-25.472 16.512-42.080c0-25.12-9.184-44.992-27.552-59.616s-43.744-21.952-76.128-21.952c-27.744 0-50.304 4.512-67.68 13.504v51.552c17.984-13.12 39.008-19.68 63.008-19.68 15.104-0.064 26.88 3.2 35.328 9.696zM735.008 704c-34.816 0-63.008 28.192-63.008 63.008v65.984c0 34.816 28.192 63.008 63.008 63.008s63.008-28.192 63.008-63.008v-65.984c0-34.816-28.192-63.008-63.008-63.008zM287.008 704c-34.816 0-63.008 28.192-63.008 63.008v65.984c0 34.816 28.192 63.008 63.008 63.008s63.008-28.192 63.008-63.008v-65.984c0-34.816-28.224-63.008-63.008-63.008z" />
<glyph unicode="&#xe906;" glyph-name="chat" d="M296.96 348.16v317.44h-194.56c-56.32 0-102.4-46.080-102.4-102.4v-307.2c0-56.32 46.080-102.4 102.4-102.4h51.2v-153.6l153.6 153.6h256c56.32 0 102.4 46.080 102.4 102.4v93.184c-3.277-0.717-6.758-1.075-10.24-1.075l-358.4 0.051zM921.6 921.6h-460.8c-56.32 0-102.4-46.080-102.4-102.4v-409.6h358.4l153.6-153.6v153.6h51.2c56.32 0 102.4 46.029 102.4 102.4v307.2c0 56.32-46.080 102.4-102.4 102.4z" />
<glyph unicode="&#xe907;" glyph-name="views" d="M512 768c-282.784 0-512-320-512-320s229.216-320 512-320 512 320 512 320-229.216 320-512 320zM512 256c-106.016 0-192 85.984-192 192s85.984 192 192 192 192-85.984 192-192-85.984-192-192-192zM512 576c-70.688 0-128-57.312-128-128s57.312-128 128-128 128 57.312 128 128-57.312 128-128 128z" />
</font></defs></svg>

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long