Skip to content

S
solo
Commit e758a9b0 authored by Van's avatar Van
Browse files
Options

皮肤写好，一大波重构&细节袭来

parent bd65e364
Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 163 deletions
src/main/webapp/skins/next/archives.ftl
View file @ e758a9b0
...@@ -8,43 +8,37 @@ ...@@ -8,43 +8,37 @@
</@head> </@head>
</head> </head>
<body> <body>
<div class="container one-column page-home"> <div class="container one-column page-archive">
<div class="headband"></div> <div class="headband"></div>
<#include "header.ftl"> <#include "header.ftl">
<main id="main" class="main"> <main id="main" class="main">
<div class="main-inner"> <div class="main-inner">
<div id="content" class="content"> <div id="content" class="content">
<article> <section id="posts" class="posts-collapse">
<header> <span class="archive-move-on"></span>
<h2> <span class="archive-page-counter">
<a rel="archive" href="${servePath}/archives.html"> 嗯..! 目前共计 ${statistic.statisticPublishedBlogArticleCount} 篇日志。 继续努力。
${archiveLabel} </span>
<#if 0 != archiveDates?size>
<#list archiveDates as archiveDate>
<div class="collection-title">
<#if "en" == localeString?substring(0, 2)>
<h2 class="archive-year motion-element">
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})
</a> </a>
</h2> </h2>
</header> <#else>
<#if 0 != archiveDates?size> <h2 class="archive-year motion-element">
<ul class="tags fn-clear"> <a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
<#list archiveDates as archiveDate> ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})
<li> </a>
<#if "en" == localeString?substring(0, 2)> </h2>
<a class="tag" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}" </#if>
title="${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})"> </div>
${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})</a> </#list>
<#else>
<a class="tag" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})">
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})</a>
</#if>
</li>
<li>
<#list articles as article>
${article.articleTitle}
</#list>
</li>
</#list>
</ul>
</#if> </#if>
</article> </section>
</div> </div>
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
......
src/main/webapp/skins/next/author-articles.ftl deleted 100644 → 0
View file @ bd65e364
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${authorName} - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${authorName}"/>
<meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
</@head>
</head>
<body>
<#include "side.ftl">
<main>
<h2 class="classify-name">
${author1Label}${authorName}
</h2>
<#include "article-list.ftl">
<#include "footer.ftl">
</main>
</body>
</html>
src/main/webapp/skins/next/css/main.css
View file @ e758a9b0
...@@ -356,8 +356,6 @@ blockquote { ...@@ -356,8 +356,6 @@ blockquote {
padding: 0; padding: 0;
} }
img { img {
display: block;
margin: auto 0;
max-width: 100%; max-width: 100%;
height: auto; height: auto;
} }
......
src/main/webapp/skins/next/css/next.css
View file @ e758a9b0
...@@ -72,10 +72,6 @@ ul.comments { ...@@ -72,10 +72,6 @@ ul.comments {
background-color: #F7F7F7; background-color: #F7F7F7;
} }
.comments li img {
vertical-align: sub;
}
.comments .comment-content { .comments .comment-content {
margin: 8px 0 0; margin: 8px 0 0;
} }
...@@ -264,8 +260,8 @@ ul.comments { ...@@ -264,8 +260,8 @@ ul.comments {
} }
.error-msg { .error-msg {
font-size: 1.5rem;
color: #9EABB3; color: #9EABB3;
margin-right: 10px;
} }
.cmtFromSym { .cmtFromSym {
......
src/main/webapp/skins/next/dynamic.ftl
View file @ e758a9b0
...@@ -8,86 +8,46 @@ ...@@ -8,86 +8,46 @@
</@head> </@head>
</head> </head>
<body> <body>
<#include "side.ftl"> <div class="container one-column page-home">
<main class="dynamic"> <div class="headband"></div>
<#if 0 != recentComments?size> <#include "header.ftl">
<ul class="comments"> <main id="main" class="main">
<#list recentComments as comment> <div class="main-inner">
<#if comment_index < 6> <div id="content" class="content">
<li> <#if 0 != recentComments?size>
<img class="avatar" title="${comment.commentName}" <ul class="comments" id="comments">
alt="${comment.commentName}" src="${comment.commentThumbnailURL}"> <#list recentComments as comment>
<div class="content"> <#if comment_index < 6>
<div class="fn-clear post-meta"> <li class="fn-clear">
<span class="fn-left"> <div class="fn-left avatar-warp">
<#if "http://" == comment.commentURL> <img class="avatar-48" title="${comment.commentName}" src="${comment.commentThumbnailURL}">
<span>${comment.commentName}</span> </div>
<#else> <div class="fn-left" style="width: 90%">
<a href="${comment.commentURL}" target="_blank">${comment.commentName}</a> <div class="fn-clear post-meta">
</#if> <span class="fn-left">
<time>${comment.commentDate?string("yy-MM-dd HH")}</time> <#if "http://" == comment.commentURL>
</span> <span>${comment.commentName}</span>
<a class="fn-right" href="${servePath}${comment.commentSharpURL}">${viewLabel}»</a> <#else>
</div> <a href="${comment.commentURL}" target="_blank">${comment.commentName}</a>
<div class="comment-content"> </#if>
${comment.commentContent} <time>${comment.commentDate?string("yyyy-MM-dd HH:mm")}</time>
</div> </span>
</div>
<div class="comment-content">
${comment.commentContent}
</div>
</div>
</li>
</#if>
</#list>
</ul>
</#if>
</div> </div>
</li> </div>
</#if> <#include "side.ftl">
</#list> </main>
</ul>
</#if>
<#if 0 != mostCommentArticles?size || 0 != mostViewCountArticles?size>
<#if 0 != mostCommentArticles?size>
<article>
<header>
<h2>
${mostCommentArticlesLabel}
</h2>
</header>
<ul>
<#list mostCommentArticles as article>
<li>
<a href="${servePath}${article.articlePermalink}" title="${article.articleTitle}" rel="nofollow">
${article.articleTitle}
</a>
<span data-ico="&#xe14e;">
${article.articleCommentCount}
</span>
</li>
</#list>
</ul>
</article>
</#if>
<#if 0 != mostViewCountArticles?size>
<article>
<header>
<h2>
${mostViewCountArticlesLabel}
</h2>
</header>
<ul>
<#list mostViewCountArticles as article>
<li>
<a href="${servePath}${article.articlePermalink}" title="${article.articleTitle}" rel="nofollow">
${article.articleTitle}
</a>
<span data-ico="&#xe185;">
${article.articleViewCount}
</span>
</li>
</#list>
</ul>
</article>
</#if>
</#if>
<#include "footer.ftl"> <#include "footer.ftl">
</main> </div>
<script> <script>
var $commentContents = $(".comments .comment-content"); var $commentContents = $(".comments .comment-content");
......
src/main/webapp/skins/next/page.ftl
View file @ e758a9b0
...@@ -9,26 +9,29 @@ ...@@ -9,26 +9,29 @@
</@head> </@head>
</head> </head>
<body> <body>
<#include "side.ftl"> <div class="container one-column page-post-detail">
<main> <div class="headband"></div>
<article class="post article-body"> <#include "header.ftl">
<section class="abstract"> <main id="main" class="main">
${page.pageContent} <div class="main-inner">
</section> <div id="content" class="content">
<footer class="fn-clear share"> <div id="posts" class="posts-expand">
<div class="fn-right"> <article class="post post-type-normal">
<span class="icon icon-t-weibo" data-type="tencent"></span> <div class="post-body">
<span class="icon icon-weibo" data-type="weibo"></span> ${page.pageContent}
<span class="icon icon-twitter" data-type="twitter"></span> </div>
<span class="icon icon-gplus" data-type="google"></span> </article>
</div> </div>
</footer>
</article>
<@comments commentList=pageComments article=page></@comments>
<#include "footer.ftl">
<@comments commentList=pageComments article=page></@comments>
</div>
</div>
<#include "side.ftl">
</main>
<#include "footer.ftl">
<@comment_script oId=page.oId></@comment_script> <@comment_script oId=page.oId></@comment_script>
</main> </div>
</body> </body>
</html> </html>
src/main/webapp/skins/next/tag-articles.ftl
View file @ e758a9b0
...@@ -8,17 +8,72 @@ ...@@ -8,17 +8,72 @@
</@head> </@head>
</head> </head>
<body> <body>
<#include "side.ftl"> <div class="container one-column">
<main> <div class="headband"></div>
<h2 class="classify-name"> <#include "header.ftl">
${tag1Label} <main id="main" class="main">
<a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}"> <div class="main-inner">
${tag.tagTitle} <div id="content" class="content">
(${tag.tagPublishedRefCount})
</a> <div id="posts" class="posts-collapse">
</h2> <div class="collection-title">
<#include "article-list.ftl"> <h2>
${tag.tagTitle}
<small>${tagLabel}</small>
</h2>
</div>
<#list articles as article>
<article class="post post-type-normal">
<header class="post-header">
<h1 class="post-title">
<a class="post-title-link" href="${servePath}${article.articlePermalink}">
<span itemprop="name">${article.articleTitle}</span>
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
<#if article.hasUpdated>
<sup>
${updatedLabel}
</sup>
</#if>
</a>
</h1>
<div class="post-meta">
<time class="post-time">
${article.articleCreateDate?string("MM-dd")}
</time>
</div>
</header>
</article>
</#list>
<#if 0 != paginationPageCount>
<nav class="pagination">
<#if 1 != paginationPageNums?first>
<a href="${servePath}${path}/${paginationPreviousPageNum}" class="extend"><i class="fa fa-angle-left"></i></a>
<a class="page-number" href="${servePath}${path}/1">1</a> ...
</#if>
<#list paginationPageNums as paginationPageNum>
<#if paginationPageNum == paginationCurrentPageNum>
<span class="page-number current">${paginationPageNum}</span>
<#else>
<a class="page-number" href="${servePath}${path}/${paginationPageNum}">${paginationPageNum}</a>
</#if>
</#list>
<#if paginationPageNums?last != paginationPageCount> ...
<a href="${servePath}${path}/${paginationPageCount}" class="page-number">${paginationPageCount}</a>
<a href="${servePath}${path}/${paginationNextPageNum}" class="extend next"><i class="fa fa-angle-right"></i></a>
</#if>
</nav>
</#if>
</div>
</div>
</div>
<#include "side.ftl">
</main>
<#include "footer.ftl"> <#include "footer.ftl">
</main> </div>
</body> </body>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment