Skip to content

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

就差 responsive 了

parent 45901615
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 795 additions and 608 deletions
src/main/webapp/skins/next/archives.ftl
View file @ 4b8dcedd
...@@ -8,42 +8,37 @@ ...@@ -8,42 +8,37 @@
</@head> </@head>
</head> </head>
<body> <body>
<div class="container one-column page-archive"> <#include "header.ftl">
<div class="headband"></div> <main class="main wrapper">
<#include "header.ftl"> <div class="content page-archive">
<main id="main" class="main"> <section class="posts-collapse">
<div class="main-inner"> <span class="archive-move-on"></span>
<div id="content" class="content"> <span class="archive-page-counter">
<section id="posts" class="posts-collapse"> 嗯..! 目前共计 ${statistic.statisticPublishedBlogArticleCount} 篇日志。 继续努力。
<span class="archive-move-on"></span> </span>
<span class="archive-page-counter"> <#if 0 != archiveDates?size>
嗯..! 目前共计 ${statistic.statisticPublishedBlogArticleCount} 篇日志。 继续努力。 <#list archiveDates as archiveDate>
</span> <article>
<#if 0 != archiveDates?size> <header class="post-header">
<#list archiveDates as archiveDate> <h1>
<div class="collection-title">
<#if "en" == localeString?substring(0, 2)> <#if "en" == localeString?substring(0, 2)>
<h2 class="archive-year motion-element"> <a class="post-title" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"> ${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})
${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount}) </a>
</a>
</h2>
<#else> <#else>
<h2 class="archive-year motion-element"> <a class="post-title" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"> ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount}) </a>
</a>
</h2>
</#if> </#if>
</div> </h1>
</#list> </header>
</#if> </article>
</section> </#list>
</div> </#if>
</div> </section>
<#include "side.ftl"> </div>
</main> <#include "side.ftl">
<#include "footer.ftl"> </main>
</div> <#include "footer.ftl">
</body> </body>
</html> </html>
src/main/webapp/skins/next/article.ftl
View file @ 4b8dcedd
...@@ -9,92 +9,82 @@ ...@@ -9,92 +9,82 @@
</@head> </@head>
</head> </head>
<body> <body>
<div class="container one-column page-post-detail"> <#include "header.ftl">
<div class="headband"></div> <main class="main wrapper">
<#include "header.ftl"> <div class="content">
<main id="main" class="main"> <article class="posts-expand">
<div class="main-inner"> <header class="post-header">
<div id="content" class="content"> <h1 class="post-title">
<div id="posts" class="posts-expand"> ${article.articleTitle}
<article class="post post-type-normal"> <#if article.articlePutTop>
<header class="post-header"> <sup>
<h1 class="post-title"> ${topArticleLabel}
${article.articleTitle} </sup>
<#if article.articlePutTop> </#if>
<sup> <#if article.hasUpdated>
${topArticleLabel} <sup>
</sup> ${updatedLabel}
</#if> </sup>
<#if article.hasUpdated> </#if>
<sup> </h1>
${updatedLabel} <div class="post-meta">
</sup> <span class="post-time">
</#if> 发表于
</h1> <time>
<div class="post-meta"> ${article.articleCreateDate?string("yyyy-MM-dd")}
<span class="post-time"> </time>
发表于 </span>
<time> <span class="post-comments-count">
${article.articleCreateDate?string("yyyy-MM-dd")} &nbsp; | &nbsp;
</time> <a href="${servePath}${article.articlePermalink}#comments">
</span> ${article.articleCommentCount}条评论</a>
<span class="post-comments-count"> </span>
&nbsp; | &nbsp; &nbsp; | &nbsp;热度
<a href="${servePath}${article.articlePermalink}#comments"> ${article.articleViewCount}°C
${article.articleCommentCount}条评论</a>
</span>
&nbsp; | &nbsp;热度
${article.articleViewCount}°C
</div>
</header>
<div class="post-body">
${article.articleContent}
<#if "" != article.articleSign.signHTML?trim>
<div>
${article.articleSign.signHTML}
</div>
</#if>
</div>
<footer class="post-footer">
<div class="post-tags">
<#list article.articleTags?split(",") as articleTag>
<a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}</a>
</#list>
</div>
<div class="post-nav">
<#if nextArticlePermalink?? || previousArticlePermalink??>
<#if previousArticlePermalink??>
<div class="post-nav-next post-nav-item">
<a href="${servePath}${previousArticlePermalink}" rel="next" title="${previousArticleTitle}">
<i class="fa fa-chevron-left"></i> ${previousArticleTitle}
</a>
</div>
</#if>
<#if nextArticlePermalink??>
<div class="post-nav-prev post-nav-item">
<a href="${servePath}${nextArticlePermalink}" rel="prev" title="${nextArticleTitle}">
${nextArticleTitle} <i class="fa fa-chevron-right"></i>
</a>
</div>
</#if>
</#if>
</div>
</footer>
</article>
</div> </div>
</header>
<@comments commentList=articleComments article=article></@comments> <div class="post-body">
${article.articleContent}
<#if "" != article.articleSign.signHTML?trim>
<div>
${article.articleSign.signHTML}
</div>
</#if>
</div> </div>
</div> <footer>
<#include "side.ftl"> <div class="post-tags">
</main> <#list article.articleTags?split(",") as articleTag>
<#include "footer.ftl"> <a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
<@comment_script oId=article.oId> ${articleTag}</a>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}"; </#list>
</@comment_script> </div>
</div> <div class="post-nav fn-clear">
<#if previousArticlePermalink??>
<div class="post-nav-prev post-nav-item fn-left">
<a href="${servePath}${previousArticlePermalink}" rel="next" title="${previousArticleTitle}">
< ${previousArticleTitle}
</a>
</div>
</#if>
<#if nextArticlePermalink??>
<div class="post-nav-next post-nav-item fn-right">
<a href="${servePath}${nextArticlePermalink}" rel="prev" title="${nextArticleTitle}">
${nextArticleTitle} >
</a>
</div>
</#if>
</div>
</footer>
</article>
</div>
<@comments commentList=articleComments article=article></@comments>
<#include "side.ftl">
</main>
<#include "footer.ftl">
<@comment_script oId=article.oId>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
</@comment_script>
</body> </body>
</html> </html>
src/main/webapp/skins/next/css/fonts/icomoon.eot 100644 → 100755
View file @ 4b8dcedd
No preview for this file type
src/main/webapp/skins/next/css/fonts/icomoon.svg 100644 → 100755
View file @ 4b8dcedd
This diff is collapsed.
src/main/webapp/skins/next/css/fonts/icomoon.ttf 100644 → 100755
View file @ 4b8dcedd
No preview for this file type
src/main/webapp/skins/next/css/fonts/icomoon.woff 100644 → 100755
View file @ 4b8dcedd
No preview for this file type
src/main/webapp/skins/next/css/fonts/selection.json 100644 → 100755
View file @ 4b8dcedd
This diff is collapsed.
src/main/webapp/skins/next/css/next.css
View file @ 4b8dcedd
This diff is collapsed.
src/main/webapp/skins/next/dynamic.ftl
View file @ 4b8dcedd
...@@ -8,46 +8,38 @@ ...@@ -8,46 +8,38 @@
</@head> </@head>
</head> </head>
<body> <body>
<div class="container one-column page-home"> <#include "header.ftl">
<div class="headband"></div> <main class="main wrapper">
<#include "header.ftl"> <div class="content">
<main id="main" class="main"> <#if 0 != recentComments?size>
<div class="main-inner"> <ul class="comments" id="comments">
<div id="content" class="content"> <#list recentComments as comment>
<#if 0 != recentComments?size> <li class="fn-clear">
<ul class="comments" id="comments"> <img class="avatar-48" title="${comment.commentName}" src="${comment.commentThumbnailURL}">
<#list recentComments as comment> <div class="comment-body">
<#if comment_index < 6> <div class="fn-clear comment-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("yyyy-MM-dd HH:mm")}</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> </li>
<div class="comment-content"> </#list>
${comment.commentContent} </ul>
</div> </#if>
</div> </div>
</li> <#include "side.ftl">
</#if> </main>
</#list> <#include "footer.ftl">
</ul>
</#if>
</div>
</div>
<#include "side.ftl">
</main>
<#include "footer.ftl">
</div>
<script> <script>
var $commentContents = $(".comments .comment-content"); var $commentContents = $(".comments .comment-content");
......
src/main/webapp/skins/next/index.ftl
View file @ 4b8dcedd
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
</@head> </@head>
</head> </head>
<body> <body>
<div class="headband"></div>
<#include "header.ftl"> <#include "header.ftl">
<main class="main wrapper"> <main class="main wrapper">
<div class="content"> <div class="content">
......
src/main/webapp/skins/next/js/next.js
View file @ 4b8dcedd
...@@ -37,7 +37,6 @@ var NexT = { ...@@ -37,7 +37,6 @@ var NexT = {
$sidebar.animate({ $sidebar.animate({
right: -320 right: -320
}); });
} else { } else {
$(this).addClass('sidebar-active'); $(this).addClass('sidebar-active');
$('body').animate({ $('body').animate({
...@@ -48,13 +47,42 @@ var NexT = { ...@@ -48,13 +47,42 @@ var NexT = {
}); });
} }
}); });
$('.site-nav-toggle').click(function () { $('.site-nav-toggle').click(function () {
$('.site-nav').slideToggle(); $('.site-nav').slideToggle();
}); });
$(document).ready(function () {
setTimeout(function () {
$('.logo-wrap').css('opacity', 1);
$('.logo-line-before i').animate({
'left': '0'
}, function () {
$('.site-title').css('opacity', 1).animate({
'top': 0
}, function () {
$('.menu').css('opacity', 1).animate({
'margin-top': '15px'
});
$('.main').css('opacity', 1).animate({
'top': '0'
});
});
});
$('.logo-line-after i').animate({
'right': '0'
});
}, 500);
});
}, },
initArticle: function () { initArticle: function () {
$('.sidebar-inner').html($('.b3-solo-list')); if ($('.b3-solo-list li').length > 0) {
$('.sidebar').html($('.b3-solo-list'));
$('.sidebar-toggle').click();
}
} }
}; };
NexT.init(); NexT.init();
\ No newline at end of file
src/main/webapp/skins/next/macro-comments.ftl
View file @ 4b8dcedd
<#macro comments commentList article> <#macro comments commentList article>
<ul class="comments fn-wrap" id="comments"> <ul class="comments" id="comments">
<#list commentList as comment> <#list commentList as comment>
<li id="${comment.oId}" class="fn-clear"> <li id="${comment.oId}" class="fn-clear">
<img class="avatar-48" title="${comment.commentName}" src="${comment.commentThumbnailURL}"> <img class="avatar-48" title="${comment.commentName}" src="${comment.commentThumbnailURL}">
......
src/main/webapp/skins/next/page.ftl
View file @ 4b8dcedd
...@@ -9,29 +9,17 @@ ...@@ -9,29 +9,17 @@
</@head> </@head>
</head> </head>
<body> <body>
<div class="container one-column page-post-detail"> <#include "header.ftl">
<div class="headband"></div> <main class="main wrapper">
<#include "header.ftl"> <div class="content">
<main id="main" class="main"> <article class="post-body">
<div class="main-inner"> ${page.pageContent}
<div id="content" class="content"> </article>
<div id="posts" class="posts-expand"> <@comments commentList=pageComments article=page></@comments>
<article class="post post-type-normal"> </div>
<div class="post-body"> <#include "side.ftl">
${page.pageContent} </main>
</div> <#include "footer.ftl">
</article> <@comment_script oId=page.oId></@comment_script>
</div>
<@comments commentList=pageComments article=page></@comments>
</div>
</div>
<#include "side.ftl">
</main>
<#include "footer.ftl">
<@comment_script oId=page.oId></@comment_script>
</div>
</body> </body>
</html> </html>
src/main/webapp/skins/next/side.ftl
View file @ 4b8dcedd
...@@ -5,91 +5,86 @@ ...@@ -5,91 +5,86 @@
</div> </div>
<aside class="sidebar"> <aside class="sidebar">
<div class="sidebar-inner"> <section>
<section class="site-overview sidebar-panel sidebar-panel-active "> <img class="site-author-image" src="${adminUser.userAvatar}" title="${userName}"/>
<div class="site-author motion-element"> <p class="site-author-name">${userName}</p>
<img class="site-author-image skip" src="${adminUser.userAvatar}" title="${userName}"/> <#if "" != noticeBoard>
<p class="site-author-name">${userName}</p> <p class="site-description motion-element">${blogSubtitle}</p>
</#if>
<nav>
<div class="site-state-item">
<a href="/archives">
<span class="site-state-item-count">${statistic.statisticPublishedBlogArticleCount}</span>
<span class="site-state-item-name">日志</span>
</a>
</div> </div>
<#if "" != noticeBoard>
<p class="site-description motion-element">${blogSubtitle}</p>
</#if>
<nav class="site-state motion-element">
<div class="site-state-item site-state-posts">
<a href="/archives">
<span class="site-state-item-count">${statistic.statisticPublishedBlogArticleCount}</span>
<span class="site-state-item-name">日志</span>
</a>
</div>
<div class="site-state-item site-state-categories">
<span class="site-state-item-count">${statistic.statisticBlogViewCount}</span>
<span class="site-state-item-name">浏览</span>
</div>
<div class="site-state-item site-state-tags"> <div class="site-state-item site-state-categories">
<a href="/tags"> <span class="site-state-item-count">${statistic.statisticBlogViewCount}</span>
<span class="site-state-item-count">${statistic.statisticPublishedBlogCommentCount}</span> <span class="site-state-item-name">浏览</span>
<span class="site-state-item-name">评论</span> </div>
</a>
</div>
</nav>
<div class="feed-link motion-element"> <div class="site-state-item site-state-tags">
<a href="${servePath}/blog-articles-rss.do" rel="alternate"> <a href="/tags">
<i class="fa fa-rss"></i> <span class="site-state-item-count">${statistic.statisticPublishedBlogCommentCount}</span>
RSS <span class="site-state-item-name">评论</span>
</a> </a>
</div> </div>
</nav>
<div class="links-of-author motion-element"> <div class="feed-link">
<#if isLoggedIn> <a href="${servePath}/blog-articles-rss.do" rel="alternate">
<span class="links-of-author-item"> <i class="icon-rss"></i>
<a href="${servePath}/admin-index.do#main" title="${adminLabel}"> RSS
<i class="fa fa-github"></i> ${adminLabel} </a>
</a> </div>
</span>
<span class="links-of-author-item"> <div class="links-of-author">
<a href="${logoutURL}"> <#if isLoggedIn>
<i class="fa fa-weibo"></i> ${logoutLabel} <span class="links-of-author-item">
</a> <a href="${servePath}/admin-index.do#main" title="${adminLabel}">
</span> <i class="icon-setting"></i> ${adminLabel}
<#else> </a>
<span class="links-of-author-item"> </span>
<a href="${loginURL}">
<i class="fa fa-github"></i> ${loginLabel}
</a>
</span>
<span class="links-of-author-item"> <span class="links-of-author-item">
<a href="${servePath}/register"> <a href="${logoutURL}">
<i class="fa fa-weibo"></i> ${registerLabel} <i class="icon-logout"></i> ${logoutLabel}
</a> </a>
</span> </span>
</#if> <#else>
</div> <span class="links-of-author-item">
<a href="${loginURL}">
<i class="fa fa-github"></i> ${loginLabel}
</a>
</span>
<#if noticeBoard??> <span class="links-of-author-item">
<div class="links-of-author motion-element"> <a href="${servePath}/register">
${noticeBoard} <i class="icon-register"></i> ${registerLabel}
</div> </a>
</#if> </span>
</#if>
</div>
<#if 0 != links?size> <#if noticeBoard??>
<div class="links-of-author motion-element"> <div class="links-of-author">
<p class="site-author-name">Links</p> ${noticeBoard}
<#list links as link> </div>
<span class="links-of-author-item"> </#if>
<a rel="friend" href="${link.linkAddress}"
title="${link.linkDescription}" target="_blank">
${link.linkTitle}
</a>
</span>
</#list>
</div>
</#if>
</section> <#if 0 != links?size>
</div> <div class="links-of-author">
<p class="site-author-name">Links</p>
<#list links as link>
<span class="links-of-author-item">
<a rel="friend" href="${link.linkAddress}"
title="${link.linkDescription}" target="_blank">
${link.linkTitle}
</a>
</span>
</#list>
</div>
</#if>
</section>
</aside> </aside>
\ No newline at end of file
src/main/webapp/skins/next/tag-articles.ftl
View file @ 4b8dcedd
...@@ -8,72 +8,62 @@ ...@@ -8,72 +8,62 @@
</@head> </@head>
</head> </head>
<body> <body>
<div class="container one-column"> <#include "header.ftl">
<div class="headband"></div> <main class="main wrapper">
<#include "header.ftl"> <div class="content posts-collapse">
<main id="main" class="main"> <div class="collection-title">
<div class="main-inner"> <h2>
<div id="content" class="content"> ${tag.tagTitle}
<small>${tagLabel}</small>
<div id="posts" class="posts-collapse"> </h2>
<div class="collection-title"> </div>
<h2> <#list articles as article>
${tag.tagTitle} <article>
<small>${tagLabel}</small> <header class="post-header">
</h2> <h1>
</div> <a class="post-title" href="${servePath}${article.articlePermalink}">
<#list articles as article> <span>${article.articleTitle}</span>
<article class="post post-type-normal"> <#if article.articlePutTop>
<header class="post-header"> <sup>
<h1 class="post-title"> ${topArticleLabel}
<a class="post-title-link" href="${servePath}${article.articlePermalink}"> </sup>
<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> </#if>
</#list> <#if article.hasUpdated>
<#if paginationPageNums?last != paginationPageCount> ... <sup>
<a href="${servePath}${path}/${paginationPageCount}" class="page-number">${paginationPageCount}</a> ${updatedLabel}
<a href="${servePath}${path}/${paginationNextPageNum}" class="extend next"><i class="fa fa-angle-right"></i></a> </sup>
</#if> </#if>
</nav> </a>
</#if> </h1>
</div> <time class="post-time">
</div> ${article.articleCreateDate?string("MM-dd")}
</div> </time>
<#include "side.ftl"> </header>
</main> </article>
<#include "footer.ftl"> </#list>
</div>
<#if 0 != paginationPageCount>
<nav class="pagination">
<#if 1 != paginationPageNums?first>
<a href="${servePath}${path}/${paginationPreviousPageNum}" class="extend next"><<</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">>></a>
</#if>
</nav>
</#if>
</div>
<#include "side.ftl">
</main>
<#include "footer.ftl">
</body> </body>
</html> </html>
src/main/webapp/skins/next/tags.ftl
View file @ 4b8dcedd
...@@ -8,40 +8,29 @@ ...@@ -8,40 +8,29 @@
</@head> </@head>
</head> </head>
<body> <body>
<div class="container one-column"> <#include "header.ftl">
<div class="headband"></div> <main class="main wrapper">
<#include "header.ftl"> <div class="content">
<main id="main" class="main"> <div class="tag-cloud">
<div class="main-inner"> 目前共计 ${tags?size} 个标签
<div id="content" class="content"> <ul class="tag-cloud-tags fn-clear" id="tags">
<div id="posts" class="posts-expand"> <#list tags as tag>
<li>
<a rel="tag" data-count="${tag.tagPublishedRefCount}"
<div class="tag-cloud"> href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
<div class="tag-cloud-title"> <span>${tag.tagTitle}</span>
目前共计 ${tags?size} 个标签 (<b>${tag.tagPublishedRefCount}</b>)
</div> </a>
<ul class="tag-cloud-tags fn-clear" id="tags"> </li>
<#list tags as tag> </#list>
<li> </ul>
<a rel="tag" data-count="${tag.tagPublishedRefCount}"
href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
<span>${tag.tagTitle}</span>
(<b>${tag.tagPublishedRefCount}</b>)
</a>
</li>
</#list>
</ul>
</div>
</div>
</div>
</div> </div>
<#include "side.ftl"> </div>
</main> <#include "side.ftl">
<#include "footer.ftl"> </main>
<script> <#include "footer.ftl">
Util.buildTags(); <script>
</script> Util.buildTags();
</div> </script>
</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