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>
<article class="post">
<header>
<h1>
<h2>
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
@ -37,7 +37,7 @@
</a>
</sup>
</#if>
</h1>
</h2>
<div class="meta">
<span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${createDateLabel}">

View File

@ -41,7 +41,7 @@
<main>
<article class="post">
<header>
<h1>
<h2>
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
@ -50,7 +50,7 @@
${topArticleLabel}
</sup>
</#if>
</h1>
</h2>
<div class="meta">
<span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${createDateLabel}">
<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;
}
.post h1 > a {
.post h2 > a {
font-size: 24px;
font-weight: 500;
text-decoration: none;

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>

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

@ -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}

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,7 +37,7 @@
</a>
</sup>
</#if>
</h1>
</h2>
<div class="post-meta">
<span>

View File

@ -41,14 +41,14 @@
<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">
${postTimeLabel}

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

@ -18,7 +18,7 @@
-->
<#list articles as article>
<h1>
<h2 class="h2">
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
@ -34,7 +34,7 @@
</a>
</sup>
</#if>
</h1>
</h2>
<div class="vditor-reset">${article.articleAbstract}</div>
<section class="meta">
<p>

View File

@ -40,14 +40,14 @@
<#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> |
@ -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>