From fc90c761597e201dc1688dec2a3499cf5c72397b Mon Sep 17 00:00:00 2001 From: Mimi <1119186082@qq.com> Date: Wed, 1 Dec 2021 12:27:52 +0800 Subject: [PATCH] Fix multiple h1 tag (#416) --- layout/_macro/post.njk | 6 +++--- layout/_partials/header/brand.njk | 2 +- layout/_partials/header/index.njk | 2 +- layout/_partials/header/menu.njk | 2 +- layout/_partials/sidebar/site-overview.njk | 8 ++++---- layout/category.njk | 4 ++-- layout/index.njk | 2 +- layout/page.njk | 2 +- layout/tag.njk | 4 ++-- source/css/_common/outline/header/site-meta.styl | 1 + 10 files changed, 17 insertions(+), 16 deletions(-) diff --git a/layout/_macro/post.njk b/layout/_macro/post.njk index 8d4b708..772dfba 100644 --- a/layout/_macro/post.njk +++ b/layout/_macro/post.njk @@ -20,7 +20,7 @@ {%- if post.header !== false %}
- <{%- if is_index %}h2{% else %}h1{%- endif %} class="post-title{%- if post.direction and post.direction.toLowerCase() === 'rtl' %} rtl{%- endif %}" itemprop="name headline"> + <{% if is_index %}h2{% else %}h1{% endif %} class="post-title{% if post.direction and post.direction.toLowerCase() === 'rtl' %} rtl{% endif %}" itemprop="name headline"> {# Link posts #} {%- if post.link %} {%- if post.sticky > 0 %} @@ -42,7 +42,7 @@ {{- post.title }} {{- post_edit(post.source) }} {%- endif %} - +
{{ partial('_partials/post/post-meta.njk') }} @@ -57,7 +57,7 @@ {#################} {### POST BODY ###} {#################} -
+
{%- if is_index %} {%- if post.description and theme.excerpt_description %}

{{ post.description }}

diff --git a/layout/_partials/header/brand.njk b/layout/_partials/header/brand.njk index ff0d296..9299960 100644 --- a/layout/_partials/header/brand.njk +++ b/layout/_partials/header/brand.njk @@ -16,7 +16,7 @@ -

{{ title }}

+ <{% if is_home() or is_archive() %}h1{% else %}p{% endif %} class="site-title">{{ title }} {%- if subtitle %} diff --git a/layout/_partials/header/index.njk b/layout/_partials/header/index.njk index 69a40c2..37c4c10 100644 --- a/layout/_partials/header/index.njk +++ b/layout/_partials/header/index.njk @@ -1,4 +1,4 @@ -{{ partial('_partials/header/brand.njk', {}, {cache: theme.cache.enable}) }} +{{ partial('_partials/header/brand.njk') }} {{ partial('_partials/header/menu.njk', {}, {cache: theme.cache.enable}) }} diff --git a/layout/_partials/header/menu.njk b/layout/_partials/header/menu.njk index 5b39769..d1dc8a5 100644 --- a/layout/_partials/header/menu.njk +++ b/layout/_partials/header/menu.njk @@ -25,7 +25,7 @@ {%- if theme.algolia_search.enable or theme.local_search.enable %}
  • - {%- if theme.menu_settings.icons %}{%- endif %}{{ __('menu.search') }} + {%- if theme.menu_settings.icons %}{% endif %}{{ __('menu.search') }}
    • {%- endif %} diff --git a/layout/_partials/sidebar/site-overview.njk b/layout/_partials/sidebar/site-overview.njk index 8f3de41..857c4c6 100644 --- a/layout/_partials/sidebar/site-overview.njk +++ b/layout/_partials/sidebar/site-overview.njk @@ -30,7 +30,7 @@ {%- endif %} {{ site.categories.length }} {{ __('state.categories') }} - {%- if hasCategoriesPage %}{%- endif %} + {%- if hasCategoriesPage %}{% endif %}
    {%- endif %} @@ -44,7 +44,7 @@ {%- endif %} {{ site.tags.length }} {{ __('state.tags') }} - {%- if hasTagsPage %}{%- endif %} + {%- if hasTagsPage %}{% endif %}
    {%- endif %} @@ -54,7 +54,7 @@ {%- if theme.chat.enable and (theme.chatra.enable or theme.tidio.enable or theme.gitter.enable) %}
    - {%- if theme.chat.icon %}{%- endif %} + {%- if theme.chat.icon %}{% endif %} {{ theme.chat.text }}
    @@ -84,7 +84,7 @@ {%- if theme.links %}
    - {%- if theme.links_settings.icon %}{%- endif %} + {%- if theme.links_settings.icon %}{% endif %} {{ theme.links_settings.title }}
      diff --git a/layout/category.njk b/layout/category.njk index a5d08f2..6468ae3 100644 --- a/layout/category.njk +++ b/layout/category.njk @@ -14,10 +14,10 @@
      -

      +

      {{- page.category }} {{ __('title.category') }} -

      +
      {{ post_template.render(page.posts) }} diff --git a/layout/index.njk b/layout/index.njk index efa4c8e..0ce84ec 100644 --- a/layout/index.njk +++ b/layout/index.njk @@ -1,7 +1,7 @@ {% extends '_layout.njk' %} {% import '_macro/sidebar.njk' as sidebar_template with context %} -{% block title %}{{ title }}{%- if theme.index_with_subtitle and subtitle %} - {{ subtitle }}{%- endif %}{% endblock %} +{% block title %}{{ title }}{% if theme.index_with_subtitle and subtitle %} - {{ subtitle }}{% endif %}{% endblock %} {% block class %}index posts-expand{% endblock %} diff --git a/layout/page.njk b/layout/page.njk index f37ee84..d30ac6e 100644 --- a/layout/page.njk +++ b/layout/page.njk @@ -27,7 +27,7 @@ {#################} {### PAGE BODY ###} {#################} -
      +
      {%- if page.type === 'tags' %} {%- include '_partials/page/tags.njk' -%} {% elif page.type === 'categories' %} diff --git a/layout/tag.njk b/layout/tag.njk index 9f968a7..96c8c2a 100644 --- a/layout/tag.njk +++ b/layout/tag.njk @@ -14,10 +14,10 @@
      -

      +

      {{- page.tag }} {{ __('title.tag') }} -

      +
      {{ post_template.render(page.posts) }} diff --git a/source/css/_common/outline/header/site-meta.styl b/source/css/_common/outline/header/site-meta.styl index 760bc63..2c7c749 100644 --- a/source/css/_common/outline/header/site-meta.styl +++ b/source/css/_common/outline/header/site-meta.styl @@ -30,6 +30,7 @@ font-family: $font-family-logo; font-size: $font-size-title; font-weight: normal; + line-height: 1.5; margin: 0; }