diff --git a/languages/en.yml b/languages/en.yml index aea7795..1c052ca 100644 --- a/languages/en.yml +++ b/languages/en.yml @@ -27,3 +27,4 @@ top: TOP read_more: Read more wordcount: Words min2read: Mins +changelog: Changelog diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml index 276bba9..8f38c60 100644 --- a/languages/zh-CN.yml +++ b/languages/zh-CN.yml @@ -27,3 +27,4 @@ top: 顶置 read_more: 阅读全文 wordcount: 字 min2read: 分钟 +changelog: 更新日志 diff --git a/layout/about.ejs b/layout/_partial/empty-page.ejs similarity index 63% rename from layout/about.ejs rename to layout/_partial/empty-page.ejs index bd15310..8215b95 100644 --- a/layout/about.ejs +++ b/layout/_partial/empty-page.ejs @@ -1,9 +1,9 @@
-
-
+
+
<%- page.content %>
-
+
<% if (page.comment) { %> <%- partial('_partial/comment/comment') %> <% } %> diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs index d47381f..2dbff1f 100644 --- a/layout/_partial/head.ejs +++ b/layout/_partial/head.ejs @@ -13,10 +13,8 @@ title = __('category') + ': ' + page.category; } else if (is_tag()) { title = __('tag') + ': ' + page.tag; - } else if (page.title === 'about') { - title = __('about'); - } else if (page.title === 'links') { - title = __('links'); + } else { + title = __(page.title); } %> diff --git a/layout/links.ejs b/layout/links.ejs deleted file mode 100644 index 57605e7..0000000 --- a/layout/links.ejs +++ /dev/null @@ -1,12 +0,0 @@ -<div class="fade-in-down-animation"> - <div class="links-container"> - <div class="links-content markdown-body"> - <%- page.content %> - </div> - <div class="links-comments"> - <% if (page.comment) { %> - <%- partial('_partial/comment/comment') %> - <% } %> - </div> - </div> -</div> diff --git a/layout/page.ejs b/layout/page.ejs index b4d8198..f41c582 100644 --- a/layout/page.ejs +++ b/layout/page.ejs @@ -37,14 +37,10 @@ <% } else if (page.title === 'tag' || page.title === 'tags') { %> <%- partial('_partial/tagcloud') %> - <% } else if (page.title === 'about') { %> - <%- partial('about') %> - - <% } else if (page.title === 'link' || page.title === 'links') { %> - <%- partial('links') %> + <% } else { %> + <%- partial('_partial/empty-page') %> <% } %> - </main> </div> diff --git a/source/css/layout/about.styl b/source/css/layout/_partial/empty-page.styl similarity index 78% rename from source/css/layout/about.styl rename to source/css/layout/_partial/empty-page.styl index 6e4466d..4d7eca3 100644 --- a/source/css/layout/about.styl +++ b/source/css/layout/_partial/empty-page.styl @@ -1,6 +1,6 @@ -@require "./common/magic-theme.styl"; +@require "../common/magic-theme.styl"; -.about-container { +.empty-page-container { background: var(--background-color); @@ -10,7 +10,7 @@ magic-container(1.001, 1.005, 20px); } - .about-content { + .empty-page-content { h1, h2, h3, h4, h5, h6 { @@ -26,4 +26,4 @@ margin-bottom: 20px; } } -} \ No newline at end of file +} diff --git a/source/css/layout/links.styl b/source/css/layout/links.styl deleted file mode 100644 index ad7b69f..0000000 --- a/source/css/layout/links.styl +++ /dev/null @@ -1,29 +0,0 @@ -@require "./common/magic-theme.styl"; - -.links-container { - - background: var(--background-color); - - magic-container(1.005, 1.01, 30px); - - +ils-tablet() { - magic-container(1.001, 1.005, 20px); - } - - .links-content { - - h1, h2, h3, h4, h5, h6 { - - &:first-child { - margin-top: 0; - } - - } - - margin-bottom: 30px; - - +ils-tablet() { - margin-bottom: 20px; - } - } -} \ No newline at end of file diff --git a/source/css/style.styl b/source/css/style.styl index b1d9b2e..e22c65b 100644 --- a/source/css/style.styl +++ b/source/css/style.styl @@ -11,9 +11,8 @@ @import "layout/_partial/archive-list.styl" @import "layout/_partial/footer.styl" @import "layout/_partial/paginator.styl" -@import "layout/about.styl" +@import "layout/_partial/empty-page.styl" @import "layout/category-list.styl" -@import "layout/links.styl" @import "layout/_partial/article-meta-info.styl" @import "layout/home-content.styl" @import "layout/archive-content.styl"