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 @@
</@head>
</head>
<body>
<div class="container one-column page-archive">
<div class="headband"></div>
<#include "header.ftl">
<main id="main" class="main">
<div class="main-inner">
<div id="content" class="content">
<section id="posts" class="posts-collapse">
<span class="archive-move-on"></span>
<span class="archive-page-counter">
嗯..! 目前共计 ${statistic.statisticPublishedBlogArticleCount} 篇日志。 继续努力。
</span>
<#if 0 != archiveDates?size>
<#list archiveDates as archiveDate>
<div class="collection-title">
<#include "header.ftl">
<main class="main wrapper">
<div class="content page-archive">
<section class="posts-collapse">
<span class="archive-move-on"></span>
<span class="archive-page-counter">
嗯..! 目前共计 ${statistic.statisticPublishedBlogArticleCount} 篇日志。 继续努力。
</span>
<#if 0 != archiveDates?size>
<#list archiveDates as archiveDate>
<article>
<header class="post-header">
<h1>
<#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>
</h2>
<a class="post-title" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})
</a>
<#else>
<h2 class="archive-year motion-element">
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})
</a>
</h2>
<a class="post-title" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})
</a>
</#if>
</div>
</#list>
</#if>
</section>
</div>
</div>
<#include "side.ftl">
</main>
<#include "footer.ftl">
</div>
</h1>
</header>
</article>
</#list>
</#if>
</section>
</div>
<#include "side.ftl">
</main>
<#include "footer.ftl">
</body>
</html>
src/main/webapp/skins/next/article.ftl
View file @ 4b8dcedd
......@@ -9,92 +9,82 @@
</@head>
</head>
<body>
<div class="container one-column page-post-detail">
<div class="headband"></div>
<#include "header.ftl">
<main id="main" class="main">
<div class="main-inner">
<div id="content" class="content">
<div id="posts" class="posts-expand">
<article class="post post-type-normal">
<header class="post-header">
<h1 class="post-title">
${article.articleTitle}
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
<#if article.hasUpdated>
<sup>
${updatedLabel}
</sup>
</#if>
</h1>
<div class="post-meta">
<span class="post-time">
发表于
<time>
${article.articleCreateDate?string("yyyy-MM-dd")}
</time>
</span>
<span class="post-comments-count">
&nbsp; | &nbsp;
<a href="${servePath}${article.articlePermalink}#comments">
${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>
<#include "header.ftl">
<main class="main wrapper">
<div class="content">
<article class="posts-expand">
<header class="post-header">
<h1 class="post-title">
${article.articleTitle}
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
<#if article.hasUpdated>
<sup>
${updatedLabel}
</sup>
</#if>
</h1>
<div class="post-meta">
<span class="post-time">
发表于
<time>
${article.articleCreateDate?string("yyyy-MM-dd")}
</time>
</span>
<span class="post-comments-count">
&nbsp; | &nbsp;
<a href="${servePath}${article.articlePermalink}#comments">
${article.articleCommentCount}条评论</a>
</span>
&nbsp; | &nbsp;热度
${article.articleViewCount}°C
</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>
<#include "side.ftl">
</main>
<#include "footer.ftl">
<@comment_script oId=article.oId>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
</@comment_script>
</div>
<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 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>
</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 @@
</@head>
</head>
<body>
<div class="container one-column page-home">
<div class="headband"></div>
<#include "header.ftl">
<main id="main" class="main">
<div class="main-inner">
<div id="content" class="content">
<#if 0 != recentComments?size>
<ul class="comments" id="comments">
<#list recentComments as comment>
<#if comment_index < 6>
<li class="fn-clear">
<div class="fn-left avatar-warp">
<img class="avatar-48" title="${comment.commentName}" src="${comment.commentThumbnailURL}">
</div>
<div class="fn-left" style="width: 90%">
<div class="fn-clear post-meta">
<span class="fn-left">
<#if "http://" == comment.commentURL>
<span>${comment.commentName}</span>
<#else>
<a href="${comment.commentURL}" target="_blank">${comment.commentName}</a>
</#if>
<time>${comment.commentDate?string("yyyy-MM-dd HH:mm")}</time>
</span>
</div>
<div class="comment-content">
${comment.commentContent}
</div>
</div>
</li>
</#if>
</#list>
</ul>
</#if>
</div>
</div>
<#include "side.ftl">
</main>
<#include "footer.ftl">
</div>
<#include "header.ftl">
<main class="main wrapper">
<div class="content">
<#if 0 != recentComments?size>
<ul class="comments" id="comments">
<#list recentComments as comment>
<li class="fn-clear">
<img class="avatar-48" title="${comment.commentName}" src="${comment.commentThumbnailURL}">
<div class="comment-body">
<div class="fn-clear comment-meta">
<span class="fn-left">
<#if "http://" == comment.commentURL>
<span>${comment.commentName}</span>
<#else>
<a href="${comment.commentURL}" target="_blank">${comment.commentName}</a>
</#if>
<time>${comment.commentDate?string("yyyy-MM-dd HH:mm")}</time>
</span>
<a class="fn-right" href="${servePath}${comment.commentSharpURL}">${viewLabel}»</a>
</div>
<div class="comment-content">
${comment.commentContent}
</div>
</div>
</li>
</#list>
</ul>
</#if>
</div>
<#include "side.ftl">
</main>
<#include "footer.ftl">
<script>
var $commentContents = $(".comments .comment-content");
......
src/main/webapp/skins/next/index.ftl
View file @ 4b8dcedd
......@@ -12,7 +12,6 @@
</@head>
</head>
<body>
<div class="headband"></div>
<#include "header.ftl">
<main class="main wrapper">
<div class="content">
......
src/main/webapp/skins/next/js/next.js
View file @ 4b8dcedd
......@@ -37,7 +37,6 @@ var NexT = {
$sidebar.animate({
right: -320
});
} else {
$(this).addClass('sidebar-active');
$('body').animate({
......@@ -48,13 +47,42 @@ var NexT = {
});
}
});
$('.site-nav-toggle').click(function () {
$('.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 () {
$('.sidebar-inner').html($('.b3-solo-list'));
if ($('.b3-solo-list li').length > 0) {
$('.sidebar').html($('.b3-solo-list'));
$('.sidebar-toggle').click();
}
}
};
NexT.init();
\ No newline at end of file
src/main/webapp/skins/next/macro-comments.ftl
View file @ 4b8dcedd
<#macro comments commentList article>
<ul class="comments fn-wrap" id="comments">
<ul class="comments" id="comments">
<#list commentList as comment>
<li id="${comment.oId}" class="fn-clear">
<img class="avatar-48" title="${comment.commentName}" src="${comment.commentThumbnailURL}">
......
src/main/webapp/skins/next/page.ftl
View file @ 4b8dcedd
......@@ -9,29 +9,17 @@
</@head>
</head>
<body>
<div class="container one-column page-post-detail">
<div class="headband"></div>
<#include "header.ftl">
<main id="main" class="main">
<div class="main-inner">
<div id="content" class="content">
<div id="posts" class="posts-expand">
<article class="post post-type-normal">
<div class="post-body">
${page.pageContent}
</div>
</article>
</div>
<@comments commentList=pageComments article=page></@comments>
</div>
</div>
<#include "side.ftl">
</main>
<#include "footer.ftl">
<@comment_script oId=page.oId></@comment_script>
</div>
<#include "header.ftl">
<main class="main wrapper">
<div class="content">
<article class="post-body">
${page.pageContent}
</article>
<@comments commentList=pageComments article=page></@comments>
</div>
<#include "side.ftl">
</main>
<#include "footer.ftl">
<@comment_script oId=page.oId></@comment_script>
</body>
</html>
src/main/webapp/skins/next/side.ftl
View file @ 4b8dcedd
......@@ -5,91 +5,86 @@
</div>
<aside class="sidebar">
<div class="sidebar-inner">
<section class="site-overview sidebar-panel sidebar-panel-active ">
<div class="site-author motion-element">
<img class="site-author-image skip" src="${adminUser.userAvatar}" title="${userName}"/>
<p class="site-author-name">${userName}</p>
<section>
<img class="site-author-image" src="${adminUser.userAvatar}" title="${userName}"/>
<p class="site-author-name">${userName}</p>
<#if "" != noticeBoard>
<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>
<#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">
<a href="/tags">
<span class="site-state-item-count">${statistic.statisticPublishedBlogCommentCount}</span>
<span class="site-state-item-name">评论</span>
</a>
</div>
</nav>
<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="feed-link motion-element">
<a href="${servePath}/blog-articles-rss.do" rel="alternate">
<i class="fa fa-rss"></i>
RSS
<div class="site-state-item site-state-tags">
<a href="/tags">
<span class="site-state-item-count">${statistic.statisticPublishedBlogCommentCount}</span>
<span class="site-state-item-name">评论</span>
</a>
</div>
</nav>
<div class="links-of-author motion-element">
<#if isLoggedIn>
<span class="links-of-author-item">
<a href="${servePath}/admin-index.do#main" title="${adminLabel}">
<i class="fa fa-github"></i> ${adminLabel}
</a>
</span>
<div class="feed-link">
<a href="${servePath}/blog-articles-rss.do" rel="alternate">
<i class="icon-rss"></i>
RSS
</a>
</div>
<span class="links-of-author-item">
<a href="${logoutURL}">
<i class="fa fa-weibo"></i> ${logoutLabel}
</a>
</span>
<#else>
<span class="links-of-author-item">
<a href="${loginURL}">
<i class="fa fa-github"></i> ${loginLabel}
</a>
</span>
<div class="links-of-author">
<#if isLoggedIn>
<span class="links-of-author-item">
<a href="${servePath}/admin-index.do#main" title="${adminLabel}">
<i class="icon-setting"></i> ${adminLabel}
</a>
</span>
<span class="links-of-author-item">
<a href="${servePath}/register">
<i class="fa fa-weibo"></i> ${registerLabel}
</a>
</span>
</#if>
</div>
<span class="links-of-author-item">
<a href="${logoutURL}">
<i class="icon-logout"></i> ${logoutLabel}
</a>
</span>
<#else>
<span class="links-of-author-item">
<a href="${loginURL}">
<i class="fa fa-github"></i> ${loginLabel}
</a>
</span>
<#if noticeBoard??>
<div class="links-of-author motion-element">
${noticeBoard}
</div>
</#if>
<span class="links-of-author-item">
<a href="${servePath}/register">
<i class="icon-register"></i> ${registerLabel}
</a>
</span>
</#if>
</div>
<#if 0 != links?size>
<div class="links-of-author motion-element">
<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>
<#if noticeBoard??>
<div class="links-of-author">
${noticeBoard}
</div>
</#if>
</section>
</div>
<#if 0 != links?size>
<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>
\ No newline at end of file
src/main/webapp/skins/next/tag-articles.ftl
View file @ 4b8dcedd
......@@ -8,72 +8,62 @@
</@head>
</head>
<body>
<div class="container one-column">
<div class="headband"></div>
<#include "header.ftl">
<main id="main" class="main">
<div class="main-inner">
<div id="content" class="content">
<div id="posts" class="posts-collapse">
<div class="collection-title">
<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>
<#include "header.ftl">
<main class="main wrapper">
<div class="content posts-collapse">
<div class="collection-title">
<h2>
${tag.tagTitle}
<small>${tagLabel}</small>
</h2>
</div>
<#list articles as article>
<article>
<header class="post-header">
<h1>
<a class="post-title" href="${servePath}${article.articlePermalink}">
<span>${article.articleTitle}</span>
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#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 article.hasUpdated>
<sup>
${updatedLabel}
</sup>
</#if>
</nav>
</#if>
</div>
</div>
</div>
<#include "side.ftl">
</main>
<#include "footer.ftl">
</div>
</a>
</h1>
<time class="post-time">
${article.articleCreateDate?string("MM-dd")}
</time>
</header>
</article>
</#list>
<#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>
</html>
src/main/webapp/skins/next/tags.ftl
View file @ 4b8dcedd
......@@ -8,40 +8,29 @@
</@head>
</head>
<body>
<div class="container one-column">
<div class="headband"></div>
<#include "header.ftl">
<main id="main" class="main">
<div class="main-inner">
<div id="content" class="content">
<div id="posts" class="posts-expand">
<div class="tag-cloud">
<div class="tag-cloud-title">
目前共计 ${tags?size} 个标签
</div>
<ul class="tag-cloud-tags fn-clear" id="tags">
<#list tags as tag>
<li>
<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>
<#include "header.ftl">
<main class="main wrapper">
<div class="content">
<div class="tag-cloud">
目前共计 ${tags?size} 个标签
<ul class="tag-cloud-tags fn-clear" id="tags">
<#list tags as tag>
<li>
<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>
<#include "side.ftl">
</main>
<#include "footer.ftl">
<script>
Util.buildTags();
</script>
</div>
</div>
<#include "side.ftl">
</main>
<#include "footer.ftl">
<script>
Util.buildTags();
</script>
</body>
</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