diff --git a/_config.yml b/_config.yml index 7112cf0..4f0a23d 100644 --- a/_config.yml +++ b/_config.yml @@ -24,4 +24,60 @@ valine: appkey: gdf6tXXLBTLg9qpjS2y6Tbw7 # your leancloud application appkey notify: false # mail notifier , https://github.com/xCss/Valine/wiki verify: false # Verification code - placeholder: 评论一下再走吧~ \ No newline at end of file + placeholder: 评论一下再走吧~ + + +# --------------------------------------------------------------- +# Font Settings +# - Find fonts on Google Fonts (https://www.google.com/fonts) +# - All fonts set here will have the following styles: +# light, light italic, normal, normal italic, bold, bold italic +# - Be aware that setting too much fonts will cause site running slowly +# - Introduce in 5.0.1 +# --------------------------------------------------------------- +# CAUTION! Safari Version 10.1.2 bug: https://github.com/iissnan/hexo-theme-next/issues/1844 +# To avoid space between header and sidebar in Pisces / Gemini themes recommended to use Web Safe fonts for `global` (and `logo`): +# Arial | Tahoma | Helvetica | Times New Roman | Courier New | Verdana | Georgia | Palatino | Garamond | Comic Sans MS | Trebuchet MS +# --------------------------------------------------------------- +font: + enable: false + + # Uri of fonts host. E.g. //fonts.googleapis.com (Default). + host: + + # Font options: + # `external: true` will load this font family from `host` above. + # `family: Times New Roman`. Without any quotes. + # `size: xx`. Use `px` as unit. + + # Global font settings used on element. + global: + external: true + family: Lato + size: + + # Font settings for Headlines (h1, h2, h3, h4, h5, h6). + # Fallback to `global` font settings. + headings: + external: true + family: + size: + + # Font settings for posts. + # Fallback to `global` font settings. + posts: + external: true + family: + + # Font settings for Logo. + # Fallback to `global` font settings. + logo: + external: true + family: + size: + + # Font settings for and code blocks. + codes: + external: true + family: Source Code Pro + size: 14 diff --git a/layout/common/about.ejs b/layout/about.ejs similarity index 85% rename from layout/common/about.ejs rename to layout/about.ejs index 309168e..9e614cb 100644 --- a/layout/common/about.ejs +++ b/layout/about.ejs @@ -5,7 +5,7 @@
<%if (page.comments) {%> - <%- partial('valine') %> + <%- partial('common/valine') %> <%}%>
diff --git a/layout/common/archive-post.ejs b/layout/archive-post.ejs similarity index 100% rename from layout/common/archive-post.ejs rename to layout/archive-post.ejs diff --git a/layout/common/article-post.ejs b/layout/article-post.ejs similarity index 89% rename from layout/common/article-post.ejs rename to layout/article-post.ejs index 4e05b69..1a55797 100644 --- a/layout/common/article-post.ejs +++ b/layout/article-post.ejs @@ -7,7 +7,7 @@
- <%- partial('article-meta-info', {articleData: page, index: true}) %> + <%- partial('common/article-meta-info', {articleData: page, index: true}) %>
@@ -30,7 +30,7 @@ <% } %>
- <%- partial('valine') %> + <%- partial('common/valine') %>
diff --git a/layout/common/category-post.ejs b/layout/category-post.ejs similarity index 100% rename from layout/common/category-post.ejs rename to layout/category-post.ejs diff --git a/layout/footer.ejs b/layout/common/footer.ejs similarity index 100% rename from layout/footer.ejs rename to layout/common/footer.ejs diff --git a/layout/header.ejs b/layout/common/header.ejs similarity index 100% rename from layout/header.ejs rename to layout/common/header.ejs diff --git a/layout/left-side.ejs b/layout/common/left-side.ejs similarity index 76% rename from layout/left-side.ejs rename to layout/common/left-side.ejs index 6ce5c18..64df8a1 100644 --- a/layout/left-side.ejs +++ b/layout/common/left-side.ejs @@ -1,6 +1,6 @@
- <%- partial('common/site-info') %> + <%- partial('site-info') %>
<%- partial('footer') %> diff --git a/layout/scripts.ejs b/layout/common/scripts.ejs similarity index 100% rename from layout/scripts.ejs rename to layout/common/scripts.ejs diff --git a/layout/common/home-post.ejs b/layout/home-post.ejs similarity index 93% rename from layout/common/home-post.ejs rename to layout/home-post.ejs index 0cd4fd4..3ba5fc9 100644 --- a/layout/common/home-post.ejs +++ b/layout/home-post.ejs @@ -16,7 +16,7 @@
- <%- partial('article-meta-info', {articleData: post, index: true}) %> + <%- partial('common/article-meta-info', {articleData: post, index: true}) %>
<% }) %> diff --git a/layout/layout.ejs b/layout/layout.ejs index c01d99f..1a4cc12 100644 --- a/layout/layout.ejs +++ b/layout/layout.ejs @@ -5,6 +5,6 @@ <%- body %> -<%- partial('scripts') %> +<%- partial('common/scripts') %> \ No newline at end of file diff --git a/layout/page.ejs b/layout/page.ejs index 5105aec..66e46c7 100644 --- a/layout/page.ejs +++ b/layout/page.ejs @@ -1,7 +1,7 @@
- <%- partial('left-side') %> + <%- partial('common/left-side') %>
<%- partial('right-side') %> diff --git a/layout/post.ejs b/layout/post.ejs deleted file mode 100644 index e2704fb..0000000 --- a/layout/post.ejs +++ /dev/null @@ -1,2 +0,0 @@ - -<%- partial('page') %> \ No newline at end of file diff --git a/layout/right-side.ejs b/layout/right-side.ejs index 21ce0b9..1047739 100644 --- a/layout/right-side.ejs +++ b/layout/right-side.ejs @@ -5,27 +5,27 @@
<% if (is_home()) { %> - <%- partial('common/home-post') %> + <%- partial('home-post') %> <% } else if (is_archive()) { %> - <%- partial('common/archive-post') %> + <%- partial('archive-post') %> <% } else if (is_post()) { %> - <%- partial('common/article-post') %> + <%- partial('article-post') %> <% } else if (is_category()) { %> - <%- partial('common/category-post') %> + <%- partial('category-post') %> <% } else if (is_tag()) { %> - <%- partial('common/tag-post') %> + <%- partial('tag-post') %> <% } else if (page.title == 'about') { %> - <%- partial('common/about') %> + <%- partial('about') %> <% } %>
\ No newline at end of file diff --git a/layout/common/tag-post.ejs b/layout/tag-post.ejs similarity index 100% rename from layout/common/tag-post.ejs rename to layout/tag-post.ejs diff --git a/source/css/common/archive-post.styl b/source/css/layout/archive-post.styl similarity index 100% rename from source/css/common/archive-post.styl rename to source/css/layout/archive-post.styl diff --git a/source/css/common/article-post.styl b/source/css/layout/article-post.styl similarity index 100% rename from source/css/common/article-post.styl rename to source/css/layout/article-post.styl diff --git a/source/css/common/category-post.styl b/source/css/layout/category-post.styl similarity index 100% rename from source/css/common/category-post.styl rename to source/css/layout/category-post.styl diff --git a/source/css/common/article-meta-info.styl b/source/css/layout/common/article-meta-info.styl similarity index 100% rename from source/css/common/article-meta-info.styl rename to source/css/layout/common/article-meta-info.styl diff --git a/source/css/footer.styl b/source/css/layout/common/footer.styl similarity index 100% rename from source/css/footer.styl rename to source/css/layout/common/footer.styl diff --git a/source/css/left-side.styl b/source/css/layout/common/left-side.styl similarity index 100% rename from source/css/left-side.styl rename to source/css/layout/common/left-side.styl diff --git a/source/css/common/nav.styl b/source/css/layout/common/nav.styl similarity index 100% rename from source/css/common/nav.styl rename to source/css/layout/common/nav.styl diff --git a/source/css/common/site-info.styl b/source/css/layout/common/site-info.styl similarity index 100% rename from source/css/common/site-info.styl rename to source/css/layout/common/site-info.styl diff --git a/source/css/common/home-post.styl b/source/css/layout/home-post.styl similarity index 100% rename from source/css/common/home-post.styl rename to source/css/layout/home-post.styl diff --git a/source/css/index.styl b/source/css/layout/index.styl similarity index 100% rename from source/css/index.styl rename to source/css/layout/index.styl diff --git a/source/css/right-side.styl b/source/css/layout/right-side.styl similarity index 100% rename from source/css/right-side.styl rename to source/css/layout/right-side.styl diff --git a/source/css/common/tag-post.styl b/source/css/layout/tag-post.styl similarity index 100% rename from source/css/common/tag-post.styl rename to source/css/layout/tag-post.styl diff --git a/source/css/style.styl b/source/css/style.styl index 7e7be42..febed14 100644 --- a/source/css/style.styl +++ b/source/css/style.styl @@ -1,17 +1,17 @@ @import "libs/font-awesome.min.css" @import "basic.styl" @import "animated.styl" -@import "index.styl" -@import "left-side.styl" -@import "right-side.styl" -@import "footer.styl" -@import "common/nav.styl" -@import "common/home-post.styl" -@import "common/archive-post.styl" -@import "common/article-post.styl" -@import "common/article-meta-info.styl" -@import "common/category-post.styl" -@import "common/tag-post.styl" -@import "common/site-info.styl" +@import "layout/index.styl" +@import "layout/right-side.styl" +@import "layout/common/left-side.styl" +@import "layout/common/footer.styl" +@import "layout/common/nav.styl" +@import "layout/home-post.styl" +@import "layout/archive-post.styl" +@import "layout/article-post.styl" +@import "layout/common/article-meta-info.styl" +@import "layout/category-post.styl" +@import "layout/tag-post.styl" +@import "layout/common/site-info.styl" @import "highlight" @import "variables.styl" diff --git a/source/css/variables.styl b/source/css/variables.styl index f8f7353..1233301 100644 --- a/source/css/variables.styl +++ b/source/css/variables.styl @@ -1,4 +1,4 @@ -// +// ================================================= // Variables // =================================================