diff --git a/layout/about.ejs b/layout/about.ejs index 84b4744..573fbe4 100644 --- a/layout/about.ejs +++ b/layout/about.ejs @@ -1,10 +1,12 @@ -
-
- <%- page.content %> -
-
- <% if (page.comments) { %> - <%- partial('_partial/comments/comment') %> - <% } %> +
+
+
+ <%- page.content %> +
+
+ <% if (page.comments) { %> + <%- partial('_partial/comments/comment') %> + <% } %> +
diff --git a/layout/archive-content.ejs b/layout/archive-content.ejs index 558b855..bd6bf66 100644 --- a/layout/archive-content.ejs +++ b/layout/archive-content.ejs @@ -1,3 +1,5 @@ -
- <%- partial('_partial/archive-list', {posts_new: site.posts}) %> +
+
+ <%- partial('_partial/archive-list', {posts_new: site.posts}) %> +
\ No newline at end of file diff --git a/layout/article-content.ejs b/layout/article-content.ejs index 618db3c..9955e09 100644 --- a/layout/article-content.ejs +++ b/layout/article-content.ejs @@ -1,41 +1,44 @@ -
+
+
-
-

<%= page.title %>

-
+
+

<%= page.title %>

+
-
- <%- partial('_partial/article-meta-info', {articleObject: page, index: true}) %> -
+
+ <%- partial('_partial/article-meta-info', {articleObject: page, index: true}) %> +
-
- <%- page.content %> -
+
+ <%- page.content %> +
-
- <% if (page.prev) { %> -
- -
- <% } %> - <% if (page.next) { %> -
- -
- <% } %> -
+
+ <% if (page.prev) { %> +
+ +
+ <% } %> + <% if (page.next) { %> +
+ +
+ <% } %> +
-
- <%- partial('_partial/comments/comment') %> +
+ <%- partial('_partial/comments/comment') %> +
- <% if ( (theme.magic.enable && !theme.magic.sidebar.enable && theme.toc.enable) || (!theme.magic.enable && theme.toc.enable)) { %>
- <%- partial('_partial/sidebar-toc') %> +
+ <%- partial('_partial/sidebar-toc') %> +
<% } %> \ No newline at end of file diff --git a/layout/category-content.ejs b/layout/category-content.ejs index 7b9a77c..8fe604f 100644 --- a/layout/category-content.ejs +++ b/layout/category-content.ejs @@ -1,6 +1,8 @@ -
-
- <%- __('category') %>:<%= page.category %> [<%= page.posts.length %>] +
+
+
+ <%- __('category') %>:<%= page.category %> [<%= page.posts.length %>] +
+ <%- partial('_partial/archive-list', {posts_new: page.posts}) %>
- <%- partial('_partial/archive-list', {posts_new: page.posts}) %>
diff --git a/layout/tag-content.ejs b/layout/tag-content.ejs index 5f091c6..441002f 100644 --- a/layout/tag-content.ejs +++ b/layout/tag-content.ejs @@ -1,4 +1,7 @@ -
-
<%- __('tag') %>:<%= page.tag %> [<%= page.posts.length %>]
- <%- partial('_partial/archive-list', {posts_new: page.posts}) %> -
+
+
+
<%- __('tag') %>:<%= page.tag %> [<%= page.posts.length %>] +
+ <%- partial('_partial/archive-list', {posts_new: page.posts}) %> +
+
\ No newline at end of file diff --git a/source/css/layout/_partial/local-search.styl b/source/css/layout/_partial/local-search.styl index daa153d..68e655f 100644 --- a/source/css/layout/_partial/local-search.styl +++ b/source/css/layout/_partial/local-search.styl @@ -43,7 +43,7 @@ $icon-size = 1.2em; } .search-header { - background: var(--border-color); + background: var(--fourth-text-color); border-top-left-radius: 2px; border-top-right-radius: 2px; display: flex; diff --git a/source/css/layout/article-content.styl b/source/css/layout/article-content.styl index 6d9f88d..1ffd6bd 100644 --- a/source/css/layout/article-content.styl +++ b/source/css/layout/article-content.styl @@ -58,9 +58,6 @@ if ((hexo-config('magic.enable') && !hexo-config('magic.sidebar.enable') && hexo .article-toc-container { position: fixed; top: $header-height + $component-interspace; - background: var(--background-color); - max-width: 200px; - max-height: 600px; if (hexo-config('side-tools.position') == left) { right: 30px; @@ -68,14 +65,19 @@ if ((hexo-config('magic.enable') && !hexo-config('magic.sidebar.enable') && hexo left: 30px; } - if (hexo-config('magic.enable') == true) { - magic-container(1.02, 1.02, 20px); - } else { - transition(); - border: 1px solid var(--border-color); - padding: 20px; - } + .article-toc { + max-width: 200px; + max-height: 600px; + background: var(--background-color); + if (hexo-config('magic.enable') == true) { + magic-container(1.02, 1.02, 20px); + } else { + transition(); + border: 1px solid var(--border-color); + padding: 20px; + } + } }