From e9e509c05bba418c588fa45f5486a7c642a580c3 Mon Sep 17 00:00:00 2001 From: izhaoo Date: Sat, 21 Nov 2020 15:26:59 +0800 Subject: [PATCH] fix: ejs --- _config.yml | 2 +- layout/_partial/components/fab.ejs | 2 +- layout/_partial/components/footer.ejs | 15 +++++---- layout/_partial/components/header.ejs | 4 +-- layout/_partial/components/menu.ejs | 4 ++- layout/_partial/components/navbar.ejs | 14 ++++++--- layout/_partial/head.ejs | 45 +++++++++++++++++---------- layout/_partial/index/item.ejs | 12 ++++--- layout/_partial/index/preview.ejs | 2 +- layout/_partial/plugins/analytics.ejs | 10 ++++-- layout/_partial/plugins/seo.ejs | 2 +- layout/_partial/post/article.ejs | 12 +++++-- layout/_partial/post/comments.ejs | 4 ++- layout/_partial/post/copyright.ejs | 7 ++--- layout/_partial/post/head.ejs | 8 ++--- layout/_partial/post/nav.ejs | 6 ++-- layout/_partial/script.ejs | 38 +++++++++++++++++----- layout/archive.ejs | 12 +++---- layout/category.ejs | 18 +++++------ layout/galleries.ejs | 22 ++++++------- layout/index.ejs | 4 ++- layout/post.ejs | 6 +++- layout/tag.ejs | 16 +++++----- source/css/_components/footer.styl | 3 +- 24 files changed, 168 insertions(+), 100 deletions(-) diff --git a/_config.yml b/_config.yml index cd67536..3cdaefc 100644 --- a/_config.yml +++ b/_config.yml @@ -61,7 +61,7 @@ preview: api: https://v1.hitokoto.cn/?encode=text&c=d # Copyright -copyright:

Powered by Hexo | Theme - zhaoo

+# copyright:

Powered by Hexo | Theme - zhaoo

# Social social: diff --git a/layout/_partial/components/fab.ejs b/layout/_partial/components/fab.ejs index 9719ba3..9ea2253 100644 --- a/layout/_partial/components/fab.ejs +++ b/layout/_partial/components/fab.ejs @@ -7,7 +7,7 @@ <% } %> <% if (theme.tencentChao.enable) { %> - +
diff --git a/layout/_partial/components/footer.ejs b/layout/_partial/components/footer.ejs index 132e64a..099c5c7 100644 --- a/layout/_partial/components/footer.ejs +++ b/layout/_partial/components/footer.ejs @@ -4,19 +4,22 @@ var arr = theme.social[i].split('||'); var url = arr[0]; var iconfont = arr[1]; - var color = arr[2] || "'"+theme.color.link+"'"; + var color = arr[2] || theme.color.link; socialList += ` - + onMouseOut="this.style.color='${theme.color.text}'"> + `; } %> \ No newline at end of file diff --git a/layout/_partial/components/header.ejs b/layout/_partial/components/header.ejs index 59b49cc..81a54b8 100644 --- a/layout/_partial/components/header.ejs +++ b/layout/_partial/components/header.ejs @@ -1,4 +1,4 @@
-

<%- title %>

-

<%- subtitle %>

+

<%= title %>

+

<%= subtitle %>

\ No newline at end of file diff --git a/layout/_partial/components/menu.ejs b/layout/_partial/components/menu.ejs index a75dd11..b8411ea 100644 --- a/layout/_partial/components/menu.ejs +++ b/layout/_partial/components/menu.ejs @@ -17,6 +17,8 @@ - <%- theme.copyright && `
${theme.copyright}
` %> + <% if (theme.copyright) { %> +
<%- theme.copyright %>
+ <% } %> \ No newline at end of file diff --git a/layout/_partial/components/navbar.ejs b/layout/_partial/components/navbar.ejs index c371017..782c2ed 100644 --- a/layout/_partial/components/navbar.ejs +++ b/layout/_partial/components/navbar.ejs @@ -14,13 +14,19 @@ <% if (title) { %> <% } %> \ No newline at end of file diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs index e05be3c..e0464f8 100644 --- a/layout/_partial/head.ejs +++ b/layout/_partial/head.ejs @@ -19,8 +19,7 @@ var description = ''; %> -> - +> @@ -29,20 +28,28 @@ var description = ''; - <%- keywords && `` %> - <%- description && `` %> - <%- config.author && `` %> - <%- theme.favicon.small && `` %> - <%- theme.favicon.medium && `` %> - <%- theme.favicon.apple_touch_icon && `` %> - <%- theme.favicon.safari_pinned_tab && `` %> - <%- theme.favicon.msapplication && ` - `%> + <%- keywords ? `` : `` %> + <%- description ? `` : `` %> + <%- config.author ? `` : `` %> + <%- theme.favicon.small ? `` : `` %> + <%- theme.favicon.medium ? `` : `` %> + <%- theme.favicon.apple_touch_icon ? `` : `` %> + <%- theme.favicon.safari_pinned_tab ? `` : `` %> + <% if (theme.favicon.msapplication) { %> + + + <% } %> <%- css(['css/style']) %> - <%- theme.vendors.iconfont_css && css(theme.vendors.iconfont_css) %> - <%- theme.fancybox && (theme.vendors.fancybox_css ? css(theme.vendors.fancybox_css) : css('lib/fancybox/fancybox.css')) %> - + + <% if (theme.vendors.iconfont_css) { %> + <%- css(theme.vendors.iconfont_css) %> + <% } %> + + <% if (theme.fancybox) { %> + <%- theme.vendors.fancybox_css ? css(theme.vendors.fancybox_css) : css('lib/fancybox/fancybox.css') %> + <% } %> + <% if(theme.highlight.enable){ %> <% if(theme.vendors.highlight_css){ %> <% for (i in theme.highlight.style) { %> @@ -104,6 +111,12 @@ var description = ''; } - <%- theme.custom.head && theme.custom.head %> - <%- theme.custom.css && css(theme.custom.css) %> + <% if (theme.custom.head) { %> + <%- theme.custom.head %> + <% } %> + + <% if (theme.custom.css) { %> + <%- css(theme.custom.css) %> + <% } %> + \ No newline at end of file diff --git a/layout/_partial/index/item.ejs b/layout/_partial/index/item.ejs index a2a2c48..3cf64c3 100644 --- a/layout/_partial/index/item.ejs +++ b/layout/_partial/index/item.ejs @@ -2,7 +2,9 @@
- <%- post.top && `
置顶
` %> + <% if (post.top) { %> +
置顶
+ <% } %> <%- image_tag(post_image(post.image), { draggable: "false" }) %> @@ -10,17 +12,17 @@

<%= post.title %>

-

<%- excerpt %>

+

<%= excerpt %>

- <%- date(post.date, "MMMM DD, YYYY") %> - <% if(theme.leancloud.enable) { %> + <%= date(post.date, "MMMM DD, YYYY") %> + <% if (theme.leancloud.enable) { %> <% } %> - <%- strip_html(post.content).length %> + <%= strip_html(post.content).length %>
diff --git a/layout/_partial/index/preview.ejs b/layout/_partial/index/preview.ejs index 5de8bc4..1beffaf 100644 --- a/layout/_partial/index/preview.ejs +++ b/layout/_partial/index/preview.ejs @@ -3,7 +3,7 @@
-

<%- theme.preview.motto.default %>

+

<%= theme.preview.motto.default %>

<% if (theme.preview.model === 'cloud') { %> <%- image_tag("/images/theme/cloud.png", {class: "preview-overlay", draggable:"false"}) %> diff --git a/layout/_partial/plugins/analytics.ejs b/layout/_partial/plugins/analytics.ejs index d7c3956..5dafff9 100644 --- a/layout/_partial/plugins/analytics.ejs +++ b/layout/_partial/plugins/analytics.ejs @@ -1,6 +1,10 @@ -<%- theme.analytics.baidu && `` %> +<% if (theme.analytics.baidu) { %> + +<% } %> -<%- theme.analytics.cnzz && `` %> +<% if (theme.analytics.cnzz) { %> + +<% } %> <% if (theme.analytics.google) { %> <% } %> -<% if(theme.analytics.tencent) { %> +<% if (theme.analytics.tencent) { %>