Skip to content

Commit

Permalink
Make Hexo 4 happy.
Browse files Browse the repository at this point in the history
  • Loading branch information
AlynxZhou committed Oct 20, 2019
1 parent df32829 commit 6a59d41
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 15 deletions.
3 changes: 2 additions & 1 deletion layout/archive.njk
Expand Up @@ -44,7 +44,8 @@
paginator({
prev_text: "<i class=\"fas fa-angle-left\" aria-label=\"" + __("accessibility.prev_page") + "\"></i>",
next_text: "<i class=\"fas fa-angle-right\" aria-label=\"" + __("accessibility.next_page") + "\"></i>",
mid_size: 1
mid_size: 1,
escape: false
})
}}
</nav>
Expand Down
3 changes: 2 additions & 1 deletion layout/category.njk
Expand Up @@ -30,7 +30,8 @@
paginator({
prev_text: "<i class=\"fas fa-angle-left\" aria-label=\"" + __("accessibility.prev_page") + "\"></i>",
next_text: "<i class=\"fas fa-angle-right\" aria-label=\"" + __("accessibility.next_page") + "\"></i>",
mid_size: 1
mid_size: 1,
escape: false
})
}}
</nav>
Expand Down
3 changes: 2 additions & 1 deletion layout/index.njk
Expand Up @@ -85,7 +85,8 @@
paginator({
prev_text: "<i class=\"fas fa-angle-left\" aria-label=\"" + __("accessibility.prev_page") + "\"></i>",
next_text: "<i class=\"fas fa-angle-right\" aria-label=\"" + __("accessibility.next_page") + "\"></i>",
mid_size: 1
mid_size: 1,
escape: false
})
}}
</nav>
Expand Down
3 changes: 2 additions & 1 deletion layout/tag.njk
Expand Up @@ -30,7 +30,8 @@
paginator({
prev_text: "<i class=\"fas fa-angle-left\" aria-label=\"" + __("accessibility.prev_page") + "\"></i>",
next_text: "<i class=\"fas fa-angle-right\" aria-label=\"" + __("accessibility.next_page") + "\"></i>",
mid_size: 1
mid_size: 1,
escape: false
})
}}
</nav>
Expand Down
2 changes: 1 addition & 1 deletion source/css/comment.styl
Expand Up @@ -47,7 +47,7 @@
}
}
}
if (getThemeConfig("comment.valine.enable")) {
if (hexo-config("comment.valine.enable")) {
.vcomments {
margin: 1em 2em;
}
Expand Down
20 changes: 10 additions & 10 deletions source/css/variables.styl
Expand Up @@ -107,26 +107,26 @@ $font-serif = "Roboto Slab", "Noto Serif", "Noto Serif CJK", Georgia, "Times New
$font-mono = Monaco, Menlo, "Roboto Mono", Consolas, monospace;
// $font-all inherits $font-sans and $font-serif, other fonts inherit $font-all.
$font-all = $font-sans, $font-serif;
if (getThemeConfig("customFont.enable") && getThemeConfig("customFont.all")) {
$font-all = getThemeConfig("customFont.all"), $font-all;
if (hexo-config("custom_font.enable") && hexo-config("custom_font.all")) {
$font-all = hexo-config("custom_font.all"), $font-all;
}
$font-title = $font-all;
if (getThemeConfig("customFont.enable") && getThemeConfig("customFont.title")) {
$font-title = getThemeConfig("customFont.title"), $font-title;
if (hexo-config("custom_font.enable") && hexo-config("custom_font.title")) {
$font-title = hexo-config("custom_font.title"), $font-title;
}
$font-subtitle = $font-all;
if (getThemeConfig("customFont.enable") && getThemeConfig("customFont.subtitle")) {
$font-subtitle = getThemeConfig("customFont.subtitle"), $font-subtitle;
if (hexo-config("custom_font.enable") && hexo-config("custom_font.subtitle")) {
$font-subtitle = hexo-config("custom_font.subtitle"), $font-subtitle;
}
$font-main = $font-all;
if (getThemeConfig("customFont.enable") && getThemeConfig("customFont.main")) {
$font-main = getThemeConfig("customFont.main"), $font-main;
if (hexo-config("custom_font.enable") && hexo-config("custom_font.main")) {
$font-main = hexo-config("custom_font.main"), $font-main;
}
// $font-code inherits $font-mono and $font-all;
$font-code = $font-mono;
$font-code = $font-code, $font-all;
if (getThemeConfig("customFont.enable") && getThemeConfig("customFont.code")) {
$font-code = getThemeConfig("customFont.code"), $font-code;
if (hexo-config("custom_font.enable") && hexo-config("custom_font.code")) {
$font-code = hexo-config("custom_font.code"), $font-code;
}
$font-size = 16px;

Expand Down

0 comments on commit 6a59d41

Please sign in to comment.