From 2eabd8d8542c37ff04b1c4f95e6c99ef4c987101 Mon Sep 17 00:00:00 2001 From: Mimi <1119186082@qq.com> Date: Thu, 19 Nov 2020 22:46:57 +0800 Subject: [PATCH] Remove extra blank lines --- _config.yml | 6 +++--- layout/_layout.njk | 16 +++++++++------- layout/_partials/footer.njk | 2 +- layout/_partials/head/head.njk | 2 +- layout/_partials/page/page-header.njk | 2 +- layout/_partials/search/index.njk | 4 ++-- layout/_scripts/index.njk | 4 ++-- layout/_third-party/analytics/index.njk | 6 +++--- layout/_third-party/index.njk | 24 ++++++++++++------------ layout/_third-party/math/index.njk | 4 ++-- layout/_third-party/statistics/index.njk | 8 ++++---- layout/archive.njk | 2 +- layout/category.njk | 2 +- layout/index.njk | 2 +- layout/page.njk | 10 +++++----- layout/tag.njk | 2 +- 16 files changed, 49 insertions(+), 47 deletions(-) diff --git a/_config.yml b/_config.yml index e83f6eb..9232ba7 100644 --- a/_config.yml +++ b/_config.yml @@ -197,8 +197,8 @@ chat: language_switcher: false footer: - # Specify the date when the site was setup. If not defined, current year will be used. - #since: 2015 + # Specify the year when the site was setup. If not defined, current year will be used. + #since: 2020 # Icon between year and copyright info. icon: @@ -406,7 +406,7 @@ github_banner: # light | light italic | normal | normal italic | bold | bold italic # Be aware that setting too much fonts will cause site running slowly # --------------------------------------------------------------- -# To avoid space between header and sidebar in scheme Pisces / Gemini, Web Safe fonts are recommended for `global` (and `title`): +# Web Safe fonts are recommended for `global` (and `title`): # Arial | Tahoma | Helvetica | Times New Roman | Courier New | Verdana | Georgia | Palatino | Garamond | Comic Sans MS | Trebuchet MS # --------------------------------------------------------------- diff --git a/layout/_layout.njk b/layout/_layout.njk index 6221972..9a26e28 100644 --- a/layout/_layout.njk +++ b/layout/_layout.njk @@ -2,7 +2,7 @@ {{ partial('_partials/head/head.njk', {}, {cache: theme.cache.enable}) }} - {% include '_partials/head/head-unique.njk' %} + {%- include '_partials/head/head-unique.njk' -%} {% block title %}{% endblock %} {{ partial('_third-party/analytics/index.njk', {}, {cache: theme.cache.enable}) }} {{ partial('_scripts/noscript.njk', {}, {cache: theme.cache.enable}) }} @@ -13,7 +13,9 @@
-
{% include '_partials/header/index.njk' %}
+
+ {%- include '_partials/header/index.njk' -%} +
{%- if theme.sidebar.display !== 'remove' %} {% block sidebar %}{% endblock %} {%- endif %} @@ -22,15 +24,15 @@ {{ partial('_partials/widgets.njk', {}, {cache: theme.cache.enable}) }}
- {% include '_partials/header/sub-menu.njk' %} + {%- include '_partials/header/sub-menu.njk' -%} {% block content %}{% endblock %} - {% include '_partials/comments.njk' %} + {%- include '_partials/comments.njk' -%}
@@ -42,8 +44,8 @@ {%- if theme.pjax %}
{%- endif %} - {% include '_third-party/math/index.njk' %} - {% include '_third-party/quicklink.njk' %} + {%- include '_third-party/math/index.njk' -%} + {%- include '_third-party/quicklink.njk' -%} {{- next_inject('bodyEnd') }} {%- if theme.pjax %} diff --git a/layout/_partials/footer.njk b/layout/_partials/footer.njk index 5265069..4241c9b 100644 --- a/layout/_partials/footer.njk +++ b/layout/_partials/footer.njk @@ -11,7 +11,7 @@ {%- endif %}
- {% set copyright_year = date(null, 'YYYY') %} + {%- set copyright_year = date(null, 'YYYY') %} © {% if theme.footer.since and theme.footer.since != copyright_year %}{{ theme.footer.since }} – {% endif %} {{ copyright_year }} diff --git a/layout/_partials/head/head.njk b/layout/_partials/head/head.njk index 949a476..cecbcc3 100644 --- a/layout/_partials/head/head.njk +++ b/layout/_partials/head/head.njk @@ -44,7 +44,7 @@ -{%-if theme.motion.enable %} +{%- if theme.motion.enable %} {%- endif %} diff --git a/layout/_partials/page/page-header.njk b/layout/_partials/page/page-header.njk index 4ba8597..497157b 100644 --- a/layout/_partials/page/page-header.njk +++ b/layout/_partials/page/page-header.njk @@ -9,7 +9,7 @@ {%- if page.description %}
{{ page.description }}
{%- endif %} - {% include '_partials/page/breadcrumb.njk' %} + {%- include '_partials/page/breadcrumb.njk' -%}
diff --git a/layout/_partials/search/index.njk b/layout/_partials/search/index.njk index 8a5106f..0a22e24 100644 --- a/layout/_partials/search/index.njk +++ b/layout/_partials/search/index.njk @@ -2,9 +2,9 @@
{%- if theme.algolia_search.enable %} - {% include 'algolia-search.njk' %} + {%- include 'algolia-search.njk' -%} {% elif theme.local_search.enable %} - {% include 'localsearch.njk' %} + {%- include 'localsearch.njk' -%} {%- endif %}
diff --git a/layout/_scripts/index.njk b/layout/_scripts/index.njk index a9fc46f..2251c1f 100644 --- a/layout/_scripts/index.njk +++ b/layout/_scripts/index.njk @@ -1,4 +1,4 @@ -{% include 'vendors.njk' %} +{%- include 'vendors.njk' -%} {{- next_js('utils.js') }} {%- if theme.motion.enable %} @@ -14,5 +14,5 @@ {{- next_js('bookmark.js') }} {%- endif %} {%- if theme.pjax %} - {% include 'pjax.njk' %} + {%- include 'pjax.njk' -%} {%- endif %} diff --git a/layout/_third-party/analytics/index.njk b/layout/_third-party/analytics/index.njk index b76f53d..0e8ab1f 100644 --- a/layout/_third-party/analytics/index.njk +++ b/layout/_third-party/analytics/index.njk @@ -1,3 +1,3 @@ -{% include 'google-analytics.njk' %} -{% include 'baidu-analytics.njk' %} -{% include 'growingio.njk' %} +{%- include 'google-analytics.njk' -%} +{%- include 'baidu-analytics.njk' -%} +{%- include 'growingio.njk' -%} diff --git a/layout/_third-party/index.njk b/layout/_third-party/index.njk index b34370e..ad94df7 100644 --- a/layout/_third-party/index.njk +++ b/layout/_third-party/index.njk @@ -1,19 +1,19 @@ -{% include 'baidu-push.njk' %} +{%- include 'baidu-push.njk' -%} -{% include 'rating.njk' %} +{%- include 'rating.njk' -%} {%- if theme.algolia_search.enable %} - {% include 'search/algolia-search.njk' %} -{% elif theme.swiftype_key %} - {% include 'search/swiftype.njk' %} -{% elif theme.local_search.enable %} - {% include 'search/localsearch.njk' %} + {%- include 'search/algolia-search.njk' -%} +{%- elif theme.swiftype_key %} + {%- include 'search/swiftype.njk' -%} +{%- elif theme.local_search.enable %} + {%- include 'search/localsearch.njk' -%} {%- endif %} -{% include 'chat/chatra.njk' %} -{% include 'chat/tidio.njk' %} +{%- include 'chat/chatra.njk' -%} +{%- include 'chat/tidio.njk' -%} -{% include 'tags/pdf.njk' %} -{% include 'tags/mermaid.njk' %} +{%- include 'tags/pdf.njk' -%} +{%- include 'tags/mermaid.njk' -%} -{% include 'nprogress.njk' %} +{%- include 'nprogress.njk' -%} diff --git a/layout/_third-party/math/index.njk b/layout/_third-party/math/index.njk index 14a72e1..456cb8d 100644 --- a/layout/_third-party/math/index.njk +++ b/layout/_third-party/math/index.njk @@ -12,9 +12,9 @@ {%- if theme.math.every_page or is_index_has_math or page.mathjax %} {%- if theme.math.mathjax.enable %} - {% include '_third-party/math/mathjax.njk' %} + {%- include '_third-party/math/mathjax.njk' -%} {% elif theme.math.katex.enable %} - {% include '_third-party/math/katex.njk' %} + {%- include '_third-party/math/katex.njk' -%} {%- endif %} {%- endif %} {%- endif %} diff --git a/layout/_third-party/statistics/index.njk b/layout/_third-party/statistics/index.njk index 891c8be..458e5cf 100644 --- a/layout/_third-party/statistics/index.njk +++ b/layout/_third-party/statistics/index.njk @@ -1,4 +1,4 @@ -{% include 'busuanzi-counter.njk' %} -{% include 'cnzz-analytics.njk' %} -{% include 'firestore.njk' %} -{% include 'lean-analytics.njk' %} +{%- include 'busuanzi-counter.njk' -%} +{%- include 'cnzz-analytics.njk' -%} +{%- include 'firestore.njk' -%} +{%- include 'lean-analytics.njk' -%} diff --git a/layout/archive.njk b/layout/archive.njk index 76e1a14..699d583 100644 --- a/layout/archive.njk +++ b/layout/archive.njk @@ -39,7 +39,7 @@ {### END ARCHIVE BLOCK ###} {#########################} - {% include '_partials/pagination.njk' %} + {%- include '_partials/pagination.njk' -%} {% endblock %} diff --git a/layout/category.njk b/layout/category.njk index 49850fd..a5d08f2 100644 --- a/layout/category.njk +++ b/layout/category.njk @@ -27,7 +27,7 @@ {### END CATEGORY BLOCK ###} {##########################} - {% include '_partials/pagination.njk' %} + {%- include '_partials/pagination.njk' -%} {% endblock %} diff --git a/layout/index.njk b/layout/index.njk index 78d67b5..efa4c8e 100644 --- a/layout/index.njk +++ b/layout/index.njk @@ -11,7 +11,7 @@ {{ partial('_macro/post.njk', {post: post, is_index: true}) }} {%- endfor %} - {% include '_partials/pagination.njk' %} + {%- include '_partials/pagination.njk' -%} {% endblock %} diff --git a/layout/page.njk b/layout/page.njk index e75e426..d07ca22 100644 --- a/layout/page.njk +++ b/layout/page.njk @@ -23,17 +23,17 @@ {### PAGE BLOCK ###} {##################}
- {% include '_partials/page/page-header.njk' %} + {%- include '_partials/page/page-header.njk' -%} {#################} {### PAGE BODY ###} {#################}
{%- if page.type === 'tags' %} - {% include '_partials/page/tags.njk' %} + {%- include '_partials/page/tags.njk' -%} {% elif page.type === 'categories' %} - {% include '_partials/page/categories.njk' %} + {%- include '_partials/page/categories.njk' -%} {% elif page.type === 'schedule' %} - {% include '_partials/page/schedule.njk' %} + {%- include '_partials/page/schedule.njk' -%} {% else %} {{ page.content }} {%- endif %} @@ -42,7 +42,7 @@ {### END PAGE BODY ###} {#####################}
- {% include '_partials/page/breadcrumb.njk' %} + {%- include '_partials/page/breadcrumb.njk' -%} {######################} {### END PAGE BLOCK ###} {######################} diff --git a/layout/tag.njk b/layout/tag.njk index 66a6a9e..9f968a7 100644 --- a/layout/tag.njk +++ b/layout/tag.njk @@ -27,7 +27,7 @@ {### END TAG BLOCK ###} {#####################} - {% include '_partials/pagination.njk' %} + {%- include '_partials/pagination.njk' -%} {% endblock %}