15 Commits

Author SHA1 Message Date
Van
8d94204592 💄 hils vs chroma 2019-09-18 14:59:38 +08:00
Van
2fbe6d9f89 ❇️ https://github.com/b3log/solo/issues/12904 2019-09-18 10:37:06 +08:00
Van
f4db24d52a fix https://github.com/b3log/solo/issues/12897 2019-09-17 10:33:21 +08:00
Van
5c864e8819 💄 https://github.com/b3log/vditor/issues/130 2019-09-09 01:38:19 +08:00
Van
ab7b7a940c 🐛 fix https://github.com/b3log/solo/issues/12885 2019-09-06 10:18:56 +08:00
Van
2556bfb0b4 ⬆️ vditor 2019-08-30 18:14:14 +08:00
Van
4148d8c552 👄 overflow 2019-08-29 10:05:25 +08:00
Van
784f7058cd 🐛 overflow 2019-08-29 10:02:35 +08:00
Van
8acd61e237 📝 fix https://github.com/b3log/solo/issues/12868 2019-08-27 18:30:49 +08:00
Van
cfceead292 https://github.com/b3log/solo/issues/12842 2019-08-27 17:37:53 +08:00
Van
6adee8cc2f 文章摘要 https://github.com/b3log/solo/issues/12863 2019-08-27 15:45:58 +08:00
Van
65343c5618 💄 https://github.com/b3log/solo/issues/12863 2019-08-26 11:48:58 +08:00
Van
739fb30584 fix https://github.com/b3log/solo/issues/12858 2019-08-23 22:03:51 +08:00
Van
2aa7e6f36e fix https://github.com/b3log/solo/issues/12862 2019-08-23 21:35:45 +08:00
Van
d2f7b0f918 ⬆️ vditor 2019-08-23 16:47:44 +08:00
71 changed files with 647 additions and 634 deletions

View File

@@ -21,7 +21,7 @@
<#list articles as article>
<article class="post">
<header>
<h1>
<h2>
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
@@ -37,10 +37,11 @@
</a>
</sup>
</#if>
</h1>
</h2>
<div class="meta">
<span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${createDateLabel}">
<span class="vditor-tooltipped vditor-tooltipped__n"
aria-label="<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>${updateDateLabel}<#else>${createDateLabel}</#if>">
<i class="icon-date"></i>
<time>
${article.articleUpdateDate?string("yyyy-MM-dd")}

View File

@@ -41,7 +41,7 @@
<main>
<article class="post">
<header>
<h1>
<h2>
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
@@ -50,12 +50,12 @@
${topArticleLabel}
</sup>
</#if>
</h1>
</h2>
<div class="meta">
<span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${createDateLabel}">
<span class="vditor-tooltipped vditor-tooltipped__n" aria-label="<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>${updateDateLabel}<#else>${createDateLabel}</#if>">
<i class="icon-date"></i>
<time>
${article.articleCreateDate?string("yyyy-MM-dd")}
${article.articleUpdateDate?string("yyyy-MM-dd")}
</time>
</span>
&nbsp; | &nbsp;

File diff suppressed because one or more lines are too long

View File

@@ -545,11 +545,11 @@ aside {
}
}
.post h1 {
.post h2 {
margin-bottom: 10px;
}
.post h1 > a {
.post h2 > a {
font-size: 24px;
font-weight: 500;
text-decoration: none;

View File

@@ -43,11 +43,7 @@
</#if>
</h2>
<div class="article-date">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yyyy HH:mm:ss")}
<#else>
${article.articleCreateDate?string("yyyy HH:mm:ss")}
</#if>
by
<a rel="nofollow" class="underline" title="${article.authorName}" href="${servePath}/authors/${article.authorId}">
${article.authorName}</a> |

View File

@@ -44,8 +44,8 @@
<div class="main-content">
<div class="article">
<div class="date">
<div class="month">${article.articleCreateDate?string("MM")}</div>
<div class="day">${article.articleCreateDate?string("dd")}</div>
<div class="month">${article.articleUpdateDate?string("MM")}</div>
<div class="day">${article.articleUpdateDate?string("dd")}</div>
</div>
<div class="left">
<h2 class="article-title">
@@ -57,11 +57,7 @@
</#if>
</h2>
<div class="article-date">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yyyy HH:mm:ss")}
<#else>
${article.articleCreateDate?string("yyyy HH:mm:ss")}
</#if>
by
<a rel="nofollow" title="${article.authorName}" href="${servePath}/authors/${article.authorId}">
${article.authorName}</a> |

File diff suppressed because one or more lines are too long

View File

@@ -38,7 +38,7 @@
<#setting locale=localeString>
</div>
<div class="row article-content">
<div class="row article-content vditor-reset">
<div class="col-sm-12" id="abstract${article.oId}">
${article.articleAbstract}
</div>

View File

@@ -58,7 +58,7 @@
<div class="row article-date">
<#setting locale="en_US">
${article.articleCreateDate?string("MMMM d, yyyy")}
${article.articleUpdateDate?string("MMMM d, yyyy")}
<#setting locale=localeString>
</div>

File diff suppressed because one or more lines are too long

View File

@@ -47,7 +47,7 @@
<div class="ft__center">
<div class="article__meta">
<time>
${article.articleCreateDate?string("yyyy-MM-dd")}
${article.articleUpdateDate?string("yyyy-MM-dd")}
</time>
/
<#list article.articleTags?split(",") as articleTag>

File diff suppressed because one or more lines are too long

View File

@@ -51,7 +51,7 @@
<div class="ft__center">
<div class="item__meta">
<time>
${article.articleCreateDate?string("yyyy-MM-dd")}
${article.articleUpdateDate?string("yyyy-MM-dd")}
</time>
/
<#list article.articleTags?split(",") as articleTag>

File diff suppressed because one or more lines are too long

View File

@@ -21,11 +21,7 @@
<div class="marginBottom40">
<div class="article-header">
<div class="article-date">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yyyy-MM-dd HH:mm")}
<#else>
${article.articleCreateDate?string("yyyy-MM-dd HH:mm")}
</#if>
${article.articleUpdateDate?string("yyyy-MM-dd")}
</div>
<div class="arrow-right"></div>
<div class="clear"></div>
@@ -34,7 +30,8 @@
<span class="left">
by&nbsp;
</span>
<a rel="nofollow" class="left" title="${article.authorName}" href="${servePath}/authors/${article.authorId}">
<a rel="nofollow" class="left" title="${article.authorName}"
href="${servePath}/authors/${article.authorId}">
${article.authorName}
</a>
<span class="clear"></span>
@@ -93,7 +90,11 @@
</#list>
<li>
<a href="${servePath}${article.articlePermalink}">
${createDateLabel}:${article.articleCreateDate?string("yyyy-MM-dd HH:mm")}
<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>
${updateDateLabel}
<#else>
${createDateLabel}
</#if>:${article.articleUpdateDate?string("yyyy-MM-dd HH:mm")}
</a>
</li>
</ul>

View File

@@ -43,11 +43,7 @@
<div class="marginBottom40">
<div class="article-header">
<div class="article-date">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yyyy-MM-dd HH")}
<#else>
${article.articleCreateDate?string("yyyy-MM-dd HH")}
</#if>
${article.articleUpdateDate?string("yyyy-MM-dd")}
</div>
<div class="arrow-right"></div>
<div class="clear"></div>

File diff suppressed because one or more lines are too long

View File

@@ -43,7 +43,7 @@
<main>
<article class="post fn-wrap">
<header>
<h1 class="post-title">
<h2 class="post-title">
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
@@ -52,7 +52,7 @@
${topArticleLabel}
</sup>
</#if>
</h1>
</h2>
<section class="post-meta">
<#list article.articleTags?split(",") as articleTag>
<span>
@@ -60,7 +60,7 @@
${articleTag}</a><#if articleTag_has_next>,</#if>
</span>
</#list>
<time>${article.articleCreateDate?string("yyyy-MM-dd")}</time>
<time>${article.articleUpdateDate?string("yyyy-MM-dd")}</time>
</section>
</header>
<section class="post-content post-content--article vditor-reset">

File diff suppressed because one or more lines are too long

View File

@@ -91,13 +91,10 @@ h4, h5, h6 {
h1 {
font-size: 5rem;
letter-spacing: -2px;
text-indent: -3px;
}
h2 {
font-size: 3.6rem;
letter-spacing: -1px;
}
h3 {
@@ -1210,7 +1207,6 @@ ul.comments {
h1 {
font-size: 4.5rem;
text-indent: -2px;
}
h2 {

View File

@@ -20,12 +20,12 @@
<header class="main-header"<#if !isIndex> style='height:30vh;'</#if>>
<div class="fn-vertical">
<div class="main-header-content fn-wrap">
<h1 class="page-title">
<h2 class="page-title">
<a href="${servePath}">${blogTitle}</a>
<#if "" != noticeBoard>
<small class="page-description"> &nbsp; ${blogSubtitle}</small>
</#if>
</h1>
</h2>
<h2 class="page-description">
<#if "" != noticeBoard>
${noticeBoard}

View File

@@ -52,7 +52,7 @@
<div class="ft__gray fn__clear">
<time>
${article.articleCreateDate?string("yyyy-MM-dd")}
${article.articleUpdateDate?string("yyyy-MM-dd")}
</time>
&nbsp;
<span class="mobile__none">

File diff suppressed because one or more lines are too long

View File

@@ -47,14 +47,14 @@
<div class="wrapper content">
<article class="post">
<header>
<h1 class="post__title">
<h2 class="post__title">
${article.articleTitle}
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
</h1>
</h2>
</header>
<section class="vditor-reset">
${article.articleContent}
@@ -74,7 +74,7 @@
</footer>
<div class="post__share fn-clear">
<time class="ft-gray">
${article.articleCreateDate?string("yyyy-MM-dd")} •
${article.articleUpdateDate?string("yyyy-MM-dd")} •
</time>
<a class="post__view" href="${servePath}${article.articlePermalink}">
${article.articleViewCount} ${viewLabel}</a>

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);

View File

@@ -80,8 +80,8 @@
<#if 0 != paginationPageCount>
<div class="pagination">
<#if 1 != paginationPageNums?first>
<a href="${servePath}${path}" title="${firstPageLabel}"><</a>
<a href="${servePath}${path}?p=${paginationPreviousPageNum}" title="${previousPageLabel}"><<</a>
<a href="${servePath}${path}" title="${firstPageLabel}"><<</a>
<a href="${servePath}${path}?p=${paginationPreviousPageNum}" title="${previousPageLabel}"><</a>
</#if>
<#list paginationPageNums as paginationPageNum>
<#if paginationPageNum == paginationCurrentPageNum>

View File

@@ -53,11 +53,7 @@
</h2>
<div class="left article-element">
<span class="date-ico" title="${dateLabel}">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yyyy-MM-dd HH:mm:ss")}
<#else>
${article.articleCreateDate?string("yyyy-MM-dd HH:mm:ss")}
</#if>
</span>
<span class="user-ico" title="${authorLabel}">
<a rel="nofollow" href="${servePath}/authors/${article.authorId}">${article.authorName}</a>

File diff suppressed because one or more lines are too long

View File

@@ -30,18 +30,18 @@
<div class="item__slant"></div>
<div class="item__slant item__slant--white"></div>
<div class="item__main">
<span class="item__sup">
<#if article.articlePutTop>
<sup class="ft__red">
${topArticleLabel}
</sup>
</#if>
<#if article.hasUpdated>
<sup>
<a class="ft__red" href="${servePath}${article.articlePermalink}">
<sup class="ft__red">
${updatedLabel}
</a>
</sup>
</#if>
</span>
<h2 class="item__title">
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
@@ -51,7 +51,8 @@
<#if articleTag_index == 0>
<div class="ico ico--${article_index % 10}"></div>
<#if article.category??>
<a class="item__tag" href="${servePath}/category/${article.category.categoryURI}">${article.category.categoryTitle}</a>
<a class="item__tag"
href="${servePath}/category/${article.category.categoryURI}">${article.category.categoryTitle}</a>
<#else>
<a rel="tag" class="item__tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}

View File

@@ -50,10 +50,14 @@
</#if>
</h2>
<div class="ft__fade item__meta">
<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>
Updated on
<#else>
Published on
</#if>
<time>
<#setting locale="en_US">
${article.articleCreateDate?string["MMM d, yyyy"]}
${article.articleUpdateDate?string["MMM d, yyyy"]}
</time>
<#if article.category??>
in <a href="${servePath}/category/${article.category.categoryURI}">${article.category.categoryTitle}</a>

File diff suppressed because one or more lines are too long

View File

@@ -318,6 +318,11 @@ a:active, a:focus, a:hover {
background-size: cover;
}
&__sup {
position: absolute;
top: 7px;
}
&__slant {
transform: rotate(-10deg) translate(10px, -10px);
opacity: .7;

View File

@@ -38,18 +38,10 @@
</h2>
<div class="posttime-blue">
<div class="posttime-MY">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yyyy-MM")}
<#else>
${article.articleCreateDate?string("yyyy-MM")}
</#if>
</div>
<div class="posttime-D">
<#if article.hasUpdated>
${article.articleUpdateDate?string("dd")}
<#else>
${article.articleCreateDate?string("dd")}
</#if>
</div>
</div>
<div class="article-abstract">

View File

@@ -56,18 +56,10 @@
</h2>
<div class="posttime-blue">
<div class="posttime-MY">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yyyy-MM")}
<#else>
${article.articleCreateDate?string("yyyy-MM")}
</#if>
</div>
<div class="posttime-D">
<#if article.hasUpdated>
${article.articleUpdateDate?string("dd")}
<#else>
${article.articleCreateDate?string("dd")}
</#if>
</div>
</div>
<div class="article-abstract">

File diff suppressed because one or more lines are too long

View File

@@ -44,11 +44,7 @@
</a>
<span class="dateIcon"></span>
<span class="left">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yyyy-MM-dd HH:mm:ss")}
<#else>
${article.articleCreateDate?string("yyyy-MM-dd HH:mm:ss")}
</#if>
</span>
</div>
<div class="right">

View File

@@ -58,11 +58,7 @@
${article.authorName}
</a>
<span class="dateIcon left"></span>
<#if article.hasUpdated>
${article.articleUpdateDate?string("yyyy-MM-dd HH:mm:ss")}
<#else>
${article.articleCreateDate?string("yyyy-MM-dd HH:mm:ss")}
</#if>
</div>
<div class="right">
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments" class="left">

File diff suppressed because one or more lines are too long

View File

@@ -24,11 +24,7 @@
<div class="article-abstract article-image">
<div class="fn-clear">
<div class="article-date" data-ico="&#xe200;">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yy-MM-dd HH:mm")}
<#else>
${article.articleCreateDate?string("yy-MM-dd HH:mm")}
</#if>
</div>
<div class="fn-right">
<a rel="nofollow" data-ico="&#xe14e;" href="${servePath}${article.articlePermalink}#comments">

View File

@@ -42,11 +42,7 @@
<#include "header.ftl">
<div class="article-header">
<span class="article-date" data-ico="&#xe200;">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yy-MM-dd HH:mm")}
<#else>
${article.articleCreateDate?string("yy-MM-dd HH:mm")}
</#if>
</span>
<h2>

File diff suppressed because one or more lines are too long

View File

@@ -39,7 +39,7 @@
<#list archiveDates as archiveDate>
<article>
<header class="post-header">
<h1>
<h2>
<#if "en" == localeString?substring(0, 2)>
<a class="post-title" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})
@@ -49,7 +49,7 @@
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})
</a>
</#if>
</h1>
</h2>
</header>
</article>
</#list>

View File

@@ -21,7 +21,7 @@
<#list articles as article>
<article class="post-item">
<header>
<h1>
<h2>
<a class="post-title-link" rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
@@ -37,11 +37,15 @@
</a>
</sup>
</#if>
</h1>
</h2>
<div class="post-meta">
<span>
<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>
${updateTimeLabel}
<#else>
${postTimeLabel}
</#if>
<time>
${article.articleUpdateDate?string("yyyy-MM-dd")}
</time>

View File

@@ -41,19 +41,23 @@
<div class="content">
<article class="posts-expand">
<header class="post-header">
<h1 class="post-title">
<h2 class="post-title">
${article.articleTitle}
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
</h1>
</h2>
<div class="post-meta">
<span class="post-time">
<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>
${updateTimeLabel}
<#else>
${postTimeLabel}
</#if>
<time>
${article.articleCreateDate?string("yyyy-MM-dd")}
${article.articleUpdateDate?string("yyyy-MM-dd")}
</time>
</span>
<span class="post-comments-count">
@@ -84,7 +88,8 @@
<div class="post-nav fn-clear">
<#if previousArticlePermalink??>
<div class="post-nav-prev post-nav-item fn-right">
<a href="${servePath}${previousArticlePermalink}" rel="prev" title="${previousArticleTitle}">
<a href="${servePath}${previousArticlePermalink}" rel="prev"
title="${previousArticleTitle}">
${previousArticleTitle} >
</a>
</div>

File diff suppressed because one or more lines are too long

View File

@@ -18,10 +18,11 @@
#
# Description: Solo language configurations(en_US).
# Version: 2.0.0.0, Feb 23, 2019
# Version: 2.1.0.0, Aug 27, 2019
# Author: Liyuan Li
#
updateTimeLabel=Update At
tocLabel=Article ToC
siteViewLabel=Site
viewsLabel=Heat

View File

@@ -18,10 +18,11 @@
#
# Description: Solo default language configurations(zh_CN).
# Version: 2.0.0.0, Feb 23, 2019
# Version: 2.1.0.0, Aug 27, 2019
# Author: Liyuan Li
#
updateTimeLabel=\u66F4\u65B0\u4E8E
tocLabel=\u6587\u7AE0\u76EE\u5F55
siteViewLabel=\u7AD9\u70B9\u6982\u89C8
viewsLabel=\u70ED\u5EA6

View File

@@ -38,11 +38,11 @@
<#list mostUsedCategories as category>
<article>
<header class="post-header">
<h1>
<h2>
<a class="post-title" href="${servePath}/category/${category.categoryURI}">
${category.categoryTitle} (${category.categoryTagCnt})</a>
<small>${category.categoryDescription}</small>
</h1>
</h2>
</header>
</article>
</#list>

View File

@@ -43,9 +43,9 @@
<div class="article-list">
<div class="item item--active">
<time class="vditor-tooltipped vditor-tooltipped__n item__date"
aria-label="${article.articleCreateDate?string("yyyy")}${yearLabel}">
${article.articleCreateDate?string("MM")}${monthLabel}
<span class="item__day">${article.articleCreateDate?string("dd")}</span>
aria-label="${article.articleUpdateDate?string("yyyy")}${yearLabel}">
${article.articleUpdateDate?string("MM")}${monthLabel}
<span class="item__day">${article.articleUpdateDate?string("dd")}</span>
</time>
<h2 class="item__title">
@@ -61,7 +61,7 @@
<div class="item__date--m fn__none">
<i class="icon__date"></i>
${article.articleCreateDate?string("yyyy-MM-dd")}
${article.articleUpdateDate?string("yyyy-MM-dd")}
</div>
<div class="ft__center">

File diff suppressed because one or more lines are too long

View File

@@ -18,7 +18,7 @@
-->
<#list articles as article>
<h1>
<h2 class="h2">
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
@@ -34,18 +34,16 @@
</a>
</sup>
</#if>
</h1>
</h2>
<div class="vditor-reset">${article.articleAbstract}</div>
<section class="meta">
<p>
${author1Label}<a rel="nofollow" href="${servePath}/authors/${article.authorId}">${article.authorName}</a> |
<#if article.hasUpdated>
<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>
${updateDateLabel}:
${article.articleUpdateDate?string("yyyy-MM-dd HH:mm")}
<#else>
${createDateLabel}:
${article.articleCreateDate?string("yyyy-MM-dd HH:mm")}
</#if> | ${viewCount1Label} <a rel="nofollow" href="${servePath}${article.articlePermalink}">
</#if> ${article.articleUpdateDate?string("yyyy-MM-dd HH:mm")} | ${viewCount1Label} <a rel="nofollow" href="${servePath}${article.articlePermalink}">
<span class="left article-browserIcon" title="${viewLabel}"></span>
${article.articleViewCount}
</a> | ${commentCount1Label}

View File

@@ -40,22 +40,22 @@
<#include "header.ftl">
<div id="b">
<article>
<h1>
<h2 class="h2">
${article.articleTitle}
<#if article.articlePutTop>
<sup class="red">
${topArticleLabel}
</sup>
</#if>
</h1>
</h2>
<section class="meta">
<p>
${author1Label}<a rel="nofollow" href="${servePath}/authors/${article.authorId}">${article.authorName}</a> |
<#if article.hasUpdated>
${updateDateLabel}:${article.articleUpdateDate?string("yyyy-MM-dd HH:mm:ss")}
<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>
${updateDateLabel}:
<#else>
${createDateLabel}:${article.articleCreateDate?string("yyyy-MM-dd HH:mm:ss")}
</#if>
${createDateLabel}:
</#if>${article.articleUpdateDate?string("yyyy-MM-dd HH:mm")} |
${viewCount1Label}<a rel="nofollow" href="${servePath}${article.articlePermalink}">
<span class="left article-browserIcon" title="${viewLabel}"></span>
${article.articleViewCount}
@@ -111,7 +111,7 @@
page.loadRandomArticles();
</#if>
<#if 0 != relevantArticlesDisplayCount>
page.loadRelevantArticles('${article.oId}', '<h4>${relevantArticles1Label}</h4>');
page.loadRelevantArticles('${article.oId}', '<h4 class="h4">${relevantArticles1Label}</h4>');
</#if>
<#if 0 != externalRelevantArticlesDisplayCount>
page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>");

File diff suppressed because one or more lines are too long

View File

@@ -107,7 +107,7 @@ a.selected {
color: #000000;
}
H1, H3, H4, H5, H6 {
.h2, .h4 {
background: url(../images/ai4.png) no-repeat 0 7px;
border-bottom: 1px solid #CCC;
color: #666;
@@ -116,30 +116,18 @@ H1, H3, H4, H5, H6 {
padding: 0 0 0 25px;
}
H1 {
.h2 {
background: url(../images/ai4.png) no-repeat 0 6px;
font-size: 15px;
}
H1 a {
.h2 a {
font-weight: bold;
font-size: 15px;
}
H2 {
font-size: 14px;
margin: 0 0 20px 0;
}
H3 {
background: url(../images/ai5.png) no-repeat 0 7px;
}
H3, H4, H5, H6 {
.h4 {
font-size: 13px;
}
h4 {
background-position: 0 5px;
}
@@ -156,6 +144,7 @@ a.sup {
&:link {
color: #444;
}
&:hover {
color: #444;
}

View File

@@ -19,14 +19,14 @@
-->
<aside>
<nav>
<h4>Search</h4>
<h4 class="h4">Search</h4>
<form action="${servePath}/search">
<input style="width: 194px" id="search" type="text" name="keyword" />
<input type="submit" value="" class="none" />
</form>
</nav>
<nav>
<h4>Navigation</h4>
<h4 class="h4">Navigation</h4>
<ul>
<li>
<a rel="nofollow" class="home" href="${servePath}">${indexLabel}</a>
@@ -53,7 +53,7 @@
</ul>
</nav>
<#if "" != noticeBoard>
<h4>${noticeBoardLabel}</h4>
<h4 class="h4">${noticeBoardLabel}</h4>
<div id="c">
<p>
${noticeBoard}
@@ -66,7 +66,7 @@
<#else>
<#if 0 != recentComments?size>
<h4>${recentCommentsLabel}</h4>
<h4 class="h4">${recentCommentsLabel}</h4>
<ul class="aside-comments">
<#list recentComments as comment>
<li>
@@ -91,7 +91,7 @@
</ul>
</#if>
<#if 0 != mostCommentArticles?size>
<h4>${mostCommentArticlesLabel}</h4>
<h4 class="h4">${mostCommentArticlesLabel}</h4>
<ul id="mostCommentArticles">
<#list mostCommentArticles as article>
<li>
@@ -105,7 +105,7 @@
</ul>
</#if>
<#if 0 != mostViewCountArticles?size>
<h4>${mostViewCountArticlesLabel}</h4>
<h4 class="h4">${mostViewCountArticlesLabel}</h4>
<ul id="mostViewCountArticles">
<#list mostViewCountArticles as article>
<li>
@@ -120,7 +120,7 @@
</#if>
<#if 0 != mostUsedCategories?size>
<h4>${categoryLabel}</h4>
<h4 class="h4">${categoryLabel}</h4>
<ul>
<#list mostUsedCategories as category>
<li>
@@ -133,7 +133,7 @@
</#if>
<#if 0 != mostUsedTags?size>
<h4>${tagsLabel}</h4>
<h4 class="h4">${tagsLabel}</h4>
<ul class="navi-tags">
<#list mostUsedTags as tag>
<li>
@@ -145,7 +145,7 @@
</ul>
</#if>
<#if 0 != links?size>
<h4>${linkLabel}</h4>
<h4 class="h4">${linkLabel}</h4>
<ul id="sideLink" class="navi-tags">
<#list links as link>
<li>
@@ -160,7 +160,7 @@
</ul>
</#if>
<#if 0 != archiveDates?size>
<h4><a href="${servePath}/archives.html">${archiveLabel}</a></h4>
<h4 class="h4"><a href="${servePath}/archives.html">${archiveLabel}</a></h4>
<ul>
<#list archiveDates as archiveDate>
<#if archiveDate_index < 10>

View File

@@ -45,11 +45,7 @@ ${topBarReplacement}
<article class="article">
<time class="article-time">
<span>
<#if article.hasUpdated>
${article.articleUpdateDate?string("yy-MM-dd HH:mm")}
<#else>
${article.articleCreateDate?string("yy-MM-dd HH:mm")}
</#if>
</span>
</time>
<h2 class="article-title">

File diff suppressed because one or more lines are too long

View File

@@ -62,7 +62,7 @@
<div class="arrow"></div>
<time class="article-time">
<span>
${article.articleCreateDate?string("yy-MM-dd HH:mm")}
${article.articleUpdateDate?string("yy-MM-dd HH:mm")}
</span>
</time>
<h3 class="article-title">
@@ -108,7 +108,7 @@
</div>
</article>
<#if paginationCurrentPageNum != paginationPageCount && 0 != paginationPageCount && !article_has_next>
<div class="article-more" onclick="timeline.getNextPage(this, '${article.articleCreateDate?string("yyyy/MM")}')" data-page="${paginationCurrentPageNum}">${moreLabel}</div>
<div class="article-more" onclick="timeline.getNextPage(this, '${article.articleUpdateDate?string("yyyy/MM")}')" data-page="${paginationCurrentPageNum}">${moreLabel}</div>
</#if>
</#if>
</#list>

View File

@@ -38,11 +38,7 @@
</div>
<div class="left article-info">
<div class="article-date">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yyyy-MM-dd")}<br>${article.articleUpdateDate?string("HH:mm:ss")}
<#else>
${article.articleCreateDate?string("yyyy-MM-dd")}<br>${article.articleCreateDate?string("HH:mm:ss")}
</#if>
</div>
<div class="article-comment">
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments">

View File

@@ -55,11 +55,7 @@
</sup>
</#if>
<span>
<#if article.hasUpdated>
${article.articleUpdateDate?string("yyyy-MM-dd HH:mm:ss")}
<#else>
${article.articleCreateDate?string("yyyy-MM-dd HH:mm:ss")}
</#if>
</span>
</a>
</h2>
@@ -91,7 +87,7 @@
</div>
<div class="right">
<span class="article-create-date left">
${article.articleCreateDate?string("yyyy-MM-dd HH:mm:ss")}&nbsp;&nbsp;
${article.articleUpdateDate?string("yyyy-MM-dd HH:mm:ss")}&nbsp;&nbsp;
</span>
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments" class="left">
&nbsp;${article.articleCommentCount} ${commentLabel}&nbsp;&nbsp;

File diff suppressed because one or more lines are too long

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>
@@ -39,18 +39,44 @@
</h2>
<time><span class="icon-date"></span> ${article.articleUpdateDate?string("yyyy-MM-dd")}</time>
</header>
<section class="abstract vditor-reset">
${article.articleAbstract}
</section>
<footer class="tags">
<span class="icon-tag"></span> &nbsp;
<#if article.articleAbstractText == ''>
<a class="abstract" href="${servePath}${article.articlePermalink}">
<img src="${article.articleImg1URL}"/>
</a>
<#else>
<a class="abstract vditor-reset" href="${servePath}${article.articlePermalink}">
${article.articleAbstractText}
</a>
</#if>
<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>
<a rel="nofollow" href="${servePath}/authors/${article.authorId}">
<img class="avatar" title="${article.authorName}" alt="${article.authorName}" src="${article.authorThumbnailURL}"/>
</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>
</article>

View File

@@ -37,9 +37,9 @@
<body>
<#include "side.ftl">
<main>
<article class="post vditor-reset">
<header>
<h2>
<article class="post">
<header class="fn__flex">
<h2 class="fn__flex-1">
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
@@ -49,20 +49,40 @@
</sup>
</#if>
</h2>
<time><span class="icon-date"></span> ${article.articleCreateDate?string("yyyy-MM-dd")}</time>
<section class="tags">
<span class="icon-tag"></span> &nbsp;
<time><span class="icon-date"></span> ${article.articleUpdateDate?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>
<a rel="nofollow" href="${servePath}/authors/${article.authorId}">
<img class="avatar prevent" title="${article.authorName}" alt="${article.authorName}" src="${article.authorThumbnailURL}"/>
</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>
</section>
</header>
</#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="abstract vditor-reset">
${article.articleContent}
<#if "" != article.articleSign.signHTML?trim>
@@ -72,15 +92,17 @@
</#if>
<#if nextArticlePermalink?? || previousArticlePermalink??>
<aside class="fn-clear">
<aside class="fn__flex">
<#if previousArticlePermalink??>
<a class="fn-left" rel="prev" href="${servePath}${previousArticlePermalink}">
<strong>&lt;</strong> ${previousArticleTitle}
<a class="fn__flex-1 fn__flex-inline" rel="prev" href="${servePath}${previousArticlePermalink}">
<strong>&lt;</strong>
<span>&nbsp; ${previousArticleTitle}&nbsp;&nbsp;&nbsp;</span>
</a>
</#if>
<#if nextArticlePermalink??>
<a class="fn-right" rel="next" href="${servePath}${nextArticlePermalink}">
${nextArticleTitle} <strong>&gt;</strong>
<a class="fn__flex-inline" rel="next" href="${servePath}${nextArticlePermalink}">
<span>${nextArticleTitle}&nbsp; </span>
<strong>&gt;</strong>
</a>
</#if>
</aside>
@@ -109,6 +131,7 @@
<#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount>
<div id="externalRelevantArticles" class="abstract"></div>
</#if>
<br>
</article>
<@comments commentList=articleComments article=article></@comments>

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 {
@@ -633,13 +641,32 @@ article .abstract {
padding-right: 30px;
padding-left: 30px;
overflow: hidden;
word-wrap: break-word
word-wrap: break-word;
display: block;
color: rgba(0,0,0,0.6);
}
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 +674,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 +692,7 @@ article .abstract a:hover {
}
}
.tags .avatar:hover,
article footer .avatar:hover,
.share span:hover {
transform: rotate(360deg);
color: #333;
@@ -797,18 +815,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 {

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