This commit is contained in:
Van 2019-08-23 22:03:51 +08:00
parent 2aa7e6f36e
commit 739fb30584
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
16 changed files with 57 additions and 68 deletions

View File

@ -21,7 +21,7 @@
<#list articles as article> <#list articles as article>
<article class="post"> <article class="post">
<header> <header>
<h1> <h2>
<a rel="bookmark" href="${servePath}${article.articlePermalink}"> <a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle} ${article.articleTitle}
</a> </a>
@ -37,7 +37,7 @@
</a> </a>
</sup> </sup>
</#if> </#if>
</h1> </h2>
<div class="meta"> <div class="meta">
<span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${createDateLabel}"> <span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${createDateLabel}">
@ -96,4 +96,4 @@
</nav> </nav>
</div> </div>
</#if> </#if>
</div> </div>

View File

@ -41,7 +41,7 @@
<main> <main>
<article class="post"> <article class="post">
<header> <header>
<h1> <h2>
<a rel="bookmark" href="${servePath}${article.articlePermalink}"> <a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle} ${article.articleTitle}
</a> </a>
@ -50,7 +50,7 @@
${topArticleLabel} ${topArticleLabel}
</sup> </sup>
</#if> </#if>
</h1> </h2>
<div class="meta"> <div class="meta">
<span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${createDateLabel}"> <span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${createDateLabel}">
<i class="icon-date"></i> <i class="icon-date"></i>

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; margin-bottom: 10px;
} }
.post h1 > a { .post h2 > a {
font-size: 24px; font-size: 24px;
font-weight: 500; font-weight: 500;
text-decoration: none; text-decoration: none;
@ -794,4 +794,4 @@ aside {
} }
} }
/* end responsive */ /* end responsive */

View File

@ -43,7 +43,7 @@
<main> <main>
<article class="post fn-wrap"> <article class="post fn-wrap">
<header> <header>
<h1 class="post-title"> <h2 class="post-title">
<a rel="bookmark" href="${servePath}${article.articlePermalink}"> <a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle} ${article.articleTitle}
</a> </a>
@ -52,7 +52,7 @@
${topArticleLabel} ${topArticleLabel}
</sup> </sup>
</#if> </#if>
</h1> </h2>
<section class="post-meta"> <section class="post-meta">
<#list article.articleTags?split(",") as articleTag> <#list article.articleTags?split(",") as articleTag>
<span> <span>
@ -138,7 +138,7 @@
<#if 0 != relevantArticlesDisplayCount> <#if 0 != relevantArticlesDisplayCount>
page.loadRelevantArticles('${article.oId}', '<h4>${relevantArticles1Label}</h4>'); page.loadRelevantArticles('${article.oId}', '<h4>${relevantArticles1Label}</h4>');
</#if> </#if>
</@comment_script> </@comment_script>
</div> </div>
</body> </body>
</html> </html>

View File

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

View File

@ -47,14 +47,14 @@
<div class="wrapper content"> <div class="wrapper content">
<article class="post"> <article class="post">
<header> <header>
<h1 class="post__title"> <h2 class="post__title">
${article.articleTitle} ${article.articleTitle}
<#if article.articlePutTop> <#if article.articlePutTop>
<sup> <sup>
${topArticleLabel} ${topArticleLabel}
</sup> </sup>
</#if> </#if>
</h1> </h2>
</header> </header>
<section class="vditor-reset"> <section class="vditor-reset">
${article.articleContent} ${article.articleContent}

View File

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

View File

@ -21,7 +21,7 @@
<#list articles as article> <#list articles as article>
<article class="post-item"> <article class="post-item">
<header> <header>
<h1> <h2>
<a class="post-title-link" rel="bookmark" href="${servePath}${article.articlePermalink}"> <a class="post-title-link" rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle} ${article.articleTitle}
</a> </a>
@ -37,7 +37,7 @@
</a> </a>
</sup> </sup>
</#if> </#if>
</h1> </h2>
<div class="post-meta"> <div class="post-meta">
<span> <span>
@ -84,4 +84,4 @@
<a href="${servePath}${path}?p=${paginationNextPageNum}" class="extend next">>></a> <a href="${servePath}${path}?p=${paginationNextPageNum}" class="extend next">>></a>
</#if> </#if>
</nav> </nav>
</#if> </#if>

View File

@ -41,14 +41,14 @@
<div class="content"> <div class="content">
<article class="posts-expand"> <article class="posts-expand">
<header class="post-header"> <header class="post-header">
<h1 class="post-title"> <h2 class="post-title">
${article.articleTitle} ${article.articleTitle}
<#if article.articlePutTop> <#if article.articlePutTop>
<sup> <sup>
${topArticleLabel} ${topArticleLabel}
</sup> </sup>
</#if> </#if>
</h1> </h2>
<div class="post-meta"> <div class="post-meta">
<span class="post-time"> <span class="post-time">
${postTimeLabel} ${postTimeLabel}
@ -92,7 +92,7 @@
<#if nextArticlePermalink??> <#if nextArticlePermalink??>
<div class="post-nav-next post-nav-item fn-left"> <div class="post-nav-next post-nav-item fn-left">
<a href="${servePath}${nextArticlePermalink}" rel="next" title="${nextArticleTitle}"> <a href="${servePath}${nextArticlePermalink}" rel="next" title="${nextArticleTitle}">
< ${nextArticleTitle} < ${nextArticleTitle}
</a> </a>
</div> </div>
</#if> </#if>

View File

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

View File

@ -18,7 +18,7 @@
--> -->
<#list articles as article> <#list articles as article>
<h1> <h2 class="h2">
<a rel="bookmark" href="${servePath}${article.articlePermalink}"> <a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle} ${article.articleTitle}
</a> </a>
@ -34,7 +34,7 @@
</a> </a>
</sup> </sup>
</#if> </#if>
</h1> </h2>
<div class="vditor-reset">${article.articleAbstract}</div> <div class="vditor-reset">${article.articleAbstract}</div>
<section class="meta"> <section class="meta">
<p> <p>
@ -48,14 +48,14 @@
</#if> | ${viewCount1Label} <a rel="nofollow" href="${servePath}${article.articlePermalink}"> </#if> | ${viewCount1Label} <a rel="nofollow" href="${servePath}${article.articlePermalink}">
<span class="left article-browserIcon" title="${viewLabel}"></span> <span class="left article-browserIcon" title="${viewLabel}"></span>
${article.articleViewCount} ${article.articleViewCount}
</a> | ${commentCount1Label} </a> | ${commentCount1Label}
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#comments">
<span class="left articles-commentIcon" title="${commentLabel}"></span> <span class="left articles-commentIcon" title="${commentLabel}"></span>
${article.articleCommentCount} ${article.articleCommentCount}
</a> </a>
</p> </p>
<p> <p>
${tags1Label} ${tags1Label}
<#list article.articleTags?split(",") as articleTag> <#list article.articleTags?split(",") as articleTag>
<span> <span>
<a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}"> <a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
@ -85,4 +85,4 @@
</#if> </#if>
&nbsp;&nbsp;${sumLabel} ${paginationPageCount} ${pageLabel} &nbsp;&nbsp;${sumLabel} ${paginationPageCount} ${pageLabel}
</div> </div>
</#if> </#if>

View File

@ -40,16 +40,16 @@
<#include "header.ftl"> <#include "header.ftl">
<div id="b"> <div id="b">
<article> <article>
<h1> <h2 class="h2">
${article.articleTitle} ${article.articleTitle}
<#if article.articlePutTop> <#if article.articlePutTop>
<sup class="red"> <sup class="red">
${topArticleLabel} ${topArticleLabel}
</sup> </sup>
</#if> </#if>
</h1> </h2>
<section class="meta"> <section class="meta">
<p> <p>
${author1Label}<a rel="nofollow" href="${servePath}/authors/${article.authorId}">${article.authorName}</a> | ${author1Label}<a rel="nofollow" href="${servePath}/authors/${article.authorId}">${article.authorName}</a> |
<#if article.hasUpdated> <#if article.hasUpdated>
${updateDateLabel}:${article.articleUpdateDate?string("yyyy-MM-dd HH:mm:ss")} ${updateDateLabel}:${article.articleUpdateDate?string("yyyy-MM-dd HH:mm:ss")}
@ -59,14 +59,14 @@
${viewCount1Label}<a rel="nofollow" href="${servePath}${article.articlePermalink}"> ${viewCount1Label}<a rel="nofollow" href="${servePath}${article.articlePermalink}">
<span class="left article-browserIcon" title="${viewLabel}"></span> <span class="left article-browserIcon" title="${viewLabel}"></span>
${article.articleViewCount} ${article.articleViewCount}
</a> | ${commentCount1Label} </a> | ${commentCount1Label}
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#comments">
<span class="left articles-commentIcon" title="${commentLabel}"></span> <span class="left articles-commentIcon" title="${commentLabel}"></span>
${article.articleCommentCount} ${article.articleCommentCount}
</a> </a>
</p> </p>
<p> <p>
${tags1Label} ${tags1Label}
<#list article.articleTags?split(",") as articleTag> <#list article.articleTags?split(",") as articleTag>
<span> <span>
<a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">${articleTag}</a><#if articleTag_has_next>,</#if> <a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">${articleTag}</a><#if articleTag_has_next>,</#if>
@ -111,11 +111,11 @@
page.loadRandomArticles(); page.loadRandomArticles();
</#if> </#if>
<#if 0 != relevantArticlesDisplayCount> <#if 0 != relevantArticlesDisplayCount>
page.loadRelevantArticles('${article.oId}', '<h4>${relevantArticles1Label}</h4>'); page.loadRelevantArticles('${article.oId}', '<h4 class="h4">${relevantArticles1Label}</h4>');
</#if> </#if>
<#if 0 != externalRelevantArticlesDisplayCount> <#if 0 != externalRelevantArticlesDisplayCount>
page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>"); page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>");
</#if> </#if>
</@comment_script> </@comment_script>
</body> </body>
</html> </html>

File diff suppressed because one or more lines are too long

View File

@ -23,7 +23,7 @@ Version: 1.0
Date: 2010-09-13 Date: 2010-09-13
Editor: Jonas Jacek Editor: Jonas Jacek
License: CC Attribution-Share Alike 3.0 Unported License: CC Attribution-Share Alike 3.0 Unported
Update: Dongxu Wang 2011-02-24 Update: Dongxu Wang 2011-02-24
@ http://dx.b3log.org @ http://dx.b3log.org
==================================================*/ ==================================================*/
/* /*
@ -107,7 +107,7 @@ a.selected {
color: #000000; color: #000000;
} }
H1, H3, H4, H5, H6 { .h2, .h4 {
background: url(../images/ai4.png) no-repeat 0 7px; background: url(../images/ai4.png) no-repeat 0 7px;
border-bottom: 1px solid #CCC; border-bottom: 1px solid #CCC;
color: #666; color: #666;
@ -116,30 +116,18 @@ H1, H3, H4, H5, H6 {
padding: 0 0 0 25px; padding: 0 0 0 25px;
} }
H1 { .h2 {
background: url(../images/ai4.png) no-repeat 0 6px; background: url(../images/ai4.png) no-repeat 0 6px;
font-size: 15px; font-size: 15px;
} }
H1 a { .h2 a {
font-weight: bold; font-weight: bold;
font-size: 15px; font-size: 15px;
} }
H2 { .h4 {
font-size: 14px;
margin: 0 0 20px 0;
}
H3 {
background: url(../images/ai5.png) no-repeat 0 7px;
}
H3, H4, H5, H6 {
font-size: 13px; font-size: 13px;
}
h4 {
background-position: 0 5px; background-position: 0 5px;
} }
@ -156,6 +144,7 @@ a.sup {
&:link { &:link {
color: #444; color: #444;
} }
&:hover { &:hover {
color: #444; color: #444;
} }

View File

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