diff --git a/400.ftl b/400.ftl new file mode 100644 index 0000000..7f3518e --- /dev/null +++ b/400.ftl @@ -0,0 +1,12 @@ +<#include "header.ftl" /> +<@head title="400-${blog_title!}"/> +
+
+
+

400

+

找不到页面啦

+ +
+
+
+<#include "footer.ftl"> \ No newline at end of file diff --git a/500.ftl b/500.ftl similarity index 80% rename from 500.ftl rename to 500.ftl index 31c0a8a..7ab4475 100644 --- a/500.ftl +++ b/500.ftl @@ -4,7 +4,7 @@

500

-

找不到页面啦

+

出错了

diff --git a/archives.ftl b/archives.ftl index 2eb06c6..b1ec13c 100644 --- a/archives.ftl +++ b/archives.ftl @@ -4,7 +4,8 @@

归档

- <@categoryTag method="list"> +
+ <#--<@categoryTag method="list"> <#list categories as category> ${category.name!}（${category.postCount!}） @@ -43,6 +44,22 @@
+ --> +
+ <@postTag method="archive" type="month"> +
+ <#list archives as archive> +

${archive.year?c}年-${archive.month?c}月

+ + +
+
diff --git a/category.ftl b/category.ftl index e886042..026aea9 100644 --- a/category.ftl +++ b/category.ftl @@ -1,5 +1,5 @@ <#include "header.ftl"> <@head title="分类：${category.name} - ${blog_title!}" />

分类：${category.name}

-<#include "module/post-list.ftl"> +<#include "module/post-module.ftl"> <#include "footer.ftl"> diff --git a/header.ftl b/header.ftl index 54f01f2..f502438 100644 --- a/header.ftl +++ b/header.ftl @@ -2,7 +2,6 @@ - <#----> ${title} @@ -37,7 +36,7 @@ <@global.head /> - <#if ! (options.blog_favicon?? && options.blog_favicon!='')> + <#if !(options.blog_favicon?? && options.blog_favicon!='')> <#-- 背景图片--> diff --git a/index.ftl b/index.ftl index 7dad1a6..187c7a6 100644 --- a/index.ftl +++ b/index.ftl @@ -1,4 +1,4 @@ -<#include "header.ftl" > +<#include "header.ftl"> <@head title="${blog_title!}"/> <#include "module/post-module.ftl"> -<#include "footer.ftl" /> \ No newline at end of file +<#include "footer.ftl"> \ No newline at end of file diff --git a/links.ftl b/links.ftl index e041208..319fef8 100644 --- a/links.ftl +++ b/links.ftl @@ -1,4 +1,4 @@ <#include "header.ftl"> <@head title="友情链接 -${blog_title!}" /> -
<#include "module/links-module.ftl">
+<#include "module/links-module.ftl"> <#include "footer.ftl"> diff --git a/module/links-module.ftl b/module/links-module.ftl index ceafa9f..d318831 100644 --- a/module/links-module.ftl +++ b/module/links-module.ftl @@ -1,27 +1,27 @@
-

友情链接

-
-
- <@linkTag method="listTeams"> - <#list teams as item> - <#--><@global.comment target=sheet type="sheet" />--> -

- ${((item.team!'')?length>0)?string((item.team!''), '小伙伴们')} -

- - - -
-
-
\ No newline at end of file + + + + diff --git a/module/page-nav.ftl b/module/page-nav.ftl new file mode 100644 index 0000000..74dde2f --- /dev/null +++ b/module/page-nav.ftl @@ -0,0 +1,28 @@ +<#macro pagination method='index' slug="" display = "3"> +
+ <#-- <@paginationTag method="index" slug="${slug!}" page="${posts.number}" total="${posts.totalPages}" display="3">--> + <@paginationTag method="${method!}" slug="${slug!}" page="${posts.number}" total="${posts.totalPages}" display="3"> + <#if pagination.hasPrev> + + « + + + <#list pagination.rainbowPages as number> + <#if number.isCurrent> + + ${number.page!} + + <#else> + + ${number.page!} + + + + <#if pagination.hasNext> + + » + + + +
+ \ No newline at end of file diff --git a/module/post-module.ftl b/module/post-module.ftl index 369b751..c0cd0a4 100644 --- a/module/post-module.ftl +++ b/module/post-module.ftl @@ -12,6 +12,21 @@ + <#if is_tag??> +
+

包含“${tag.name}”标签的文章

+
+ + <#if is_category??> +
+

“${category.name}”分类下的文章

+
+ + <#if is_search??> +
+

包含“${keyword!}”关键字的文章

+
+
<#list posts.content as post>
@@ -45,11 +60,12 @@
-
- <@paginationTag method="index" slug="${slug!}" page="${posts.number}" total="${posts.totalPages}" display="3"> +
+ <@paginationTag method="index" slug="${slug!}" page="${posts.number}" total="${posts.totalPages}" display="3"> + <#-- <@paginationTag method="${method!}" slug="${slug!}" page="${posts.number}" total="${posts.totalPages}" display="3">--> <#if pagination.hasPrev> - - + + « <#list pagination.rainbowPages as number> @@ -58,17 +74,17 @@ ${number.page!} <#else> - + ${number.page!} <#if pagination.hasNext> - - + + » -
+
\ No newline at end of file diff --git a/post.ftl b/post.ftl index 1181ed6..86a1936 100644 --- a/post.ftl +++ b/post.ftl @@ -64,7 +64,7 @@ - <@global.comment target=post type="post" /> + <#include "footer.ftl"> diff --git a/source/css/kico.css b/source/css/kico.css index 407ad11..083d237 100644 --- a/source/css/kico.css +++ b/source/css/kico.css @@ -388,8 +388,26 @@ article a{ article > *{ margin-bottom: 1em } article > *:last-child{ margin-bottom: 0 } -article h1, article h2, article h3{ font-size: 1.2em } -article h4, article h5, article h6{ font-size: 1.1em } +/*article h1, article h2, article h3{ font-size: 1.2em } +/*article h1{ + font-size: 1.5em; +} +article h2{ + font-size: 1.4em; +} +article h3{ + font-size: 1.3em; +} +article h4{ + font-size: 1.2em; +} +article h5{ + font-size: 1.1em; +} +article h6{ + font-size: 1.0em; +} +article h4, article h5, article h6{ font-size: 1.1em }*/ article ul, article ol, article dl{ line-height: 1.8 } @@ -498,7 +516,7 @@ blockquote{ line-height: 1.8; font-style: oblique; background: #f5fafd; - padding: 1em 1em 1em 2em; + padding: 1em 1em 1em 1em; border-left: 5px #3498db solid; } diff --git a/source/css/single.css b/source/css/single.css index fd989fd..5990cd6 100644 --- a/source/css/single.css +++ b/source/css/single.css @@ -17,21 +17,22 @@ :root{ --blue: #6f9fc7; --light-blue: #9fcff7; - --border: #ddd; --dark-border: #ccc; --light-border: #eee; - --light-background: #fff; - --radius: .25em; + --dark-blue: #6e8aad; + --board-back: #fff; + --board-border: #ccc; } body{ - color: #555; + color: rgb(46, 44, 44); font-weight: 300; background: #fafafa; transition: margin .3s, background .3s; + display: block; } body:before{ @@ -385,7 +386,7 @@ main img { /* - 首页大标题 */ .home-title{ text-align: center; - margin-bottom: 3em; + margin-bottom: 1em; animation: fade-in-bottom .3s both; -webkit-animation: fade-in-bottom .3s both; } @@ -415,7 +416,7 @@ main img { /* - 文章简要 */ .post-item{ - margin-bottom: 3em; + margin-bottom: 2em; word-break: break-all; width:100%; height:100%; @@ -503,7 +504,8 @@ main img { margin-bottom: 1em; padding-bottom: 1em; transition: border 0.3s; - border-bottom: 1px solid #ddd; + /*border-bottom: 1px solid #ddd;*/ + border-bottom: 1px solid #6e8aad; border-color: var(--border); animation: fade-in-bottom .3s both; -webkit-animation: fade-in-bottom .3s both; } @@ -531,11 +533,16 @@ article img{ .post-content, .page-content{ animation: fade-in-top .3s .2s backwards; -webkit-animation: fade-in-top .3s .2s backwards; } .post-content, .page-content, .post-near, .post-tags, .post-author{ margin-bottom: 3em } -article h1, article h2, article h3{ - margin-top: 3rem; +article h1, article h2, article h3,article h4,article h5,article h6{ + margin-top: 0rem; scroll-margin-top: 5em; + margin-bottom: 0em; +} +article p{ + margin-bottom: 0.6em; } +article h1{ font-size: 1.2em } article h2{ font-size: 1.15em } article h3{ font-size: 1.10em } article h4{ font-size: 1.05em } @@ -544,7 +551,10 @@ article h6{ font-size: .9em } article h1:before, article h2:before, -article h3:before{ +article h3:before, +article h4:before, +article h5:before, +article h6:before{ content: "#"; color: #6f9fc7; color: var(--blue); diff --git a/tags.ftl b/tags.ftl index c81cec4..6bf9c5e 100644 --- a/tags.ftl +++ b/tags.ftl @@ -29,7 +29,7 @@
<#if tags?? && tags?size gt 0> <#list tags as tag> - ${tag.name}(${tag.postCount!}) + ${tag.name}(${tag.postCount!})