From b63c60fccf43861b6900c71479af96a468b996e6 Mon Sep 17 00:00:00 2001
From: Mimi <1119186082@qq.com>
Date: Tue, 25 Aug 2020 02:04:54 +0800
Subject: [PATCH] Fix post-meta

---
 .github/label-commenter-config.yml            |   3 +-
 layout/_macro/post.njk                        | 107 +----------------
 layout/_partials/post/post-meta.njk           | 109 ++++++++++++++++++
 .../_common/components/pages/breadcrumb.styl  |   4 +-
 .../_common/components/post/post-header.styl  |   2 +-
 5 files changed, 115 insertions(+), 110 deletions(-)
 create mode 100644 layout/_partials/post/post-meta.njk

diff --git a/.github/label-commenter-config.yml b/.github/label-commenter-config.yml
index 9b2ca4b..2e83d50 100644
--- a/.github/label-commenter-config.yml
+++ b/.github/label-commenter-config.yml
@@ -15,7 +15,8 @@ labels:
   - name: 🎯 Roadmap
     labeled:
       issue:
-        body: This issue has been added to the latest roadmap.
+        body: |
+          This issue has been added to the latest roadmap. :tada:
   - name: Support
     labeled:
       issue:
diff --git a/layout/_macro/post.njk b/layout/_macro/post.njk
index a232b1c..12a2fdb 100644
--- a/layout/_macro/post.njk
+++ b/layout/_macro/post.njk
@@ -44,112 +44,7 @@
         </{%- if is_index %}h2{% else %}h1{%- endif %}>
 
         <div class="post-meta-container">
-          <div class="post-meta">
-          {%- set date_diff = date(post.date) != date(post.updated) %}
-          {%- set time_diff = time(post.date) != time(post.updated) %}
-
-          {%- if theme.post_meta.created_at %}
-            <span class="post-meta-item">
-              <span class="post-meta-item-icon">
-                <i class="far fa-calendar"></i>
-              </span>
-              <span class="post-meta-item-text">{{ __('post.posted') }}</span>
-
-              {%- if not date_diff and time_diff and theme.post_meta.updated_at.enable and theme.post_meta.updated_at.another_day %}
-                {%- set create_title = __('post.created') + __('symbol.colon') + full_date(post.date) + ' / ' + __('post.modified') + __('symbol.colon') + time(post.updated) %}
-              {% else %}
-                {%- set create_title = __('post.created') + __('symbol.colon') + full_date(post.date) %}
-              {%- endif %}
-
-              <time title="{{ create_title }}" itemprop="dateCreated datePublished" datetime="{{ moment(post.date).format() }}">{{ date(post.date) }}</time>
-            </span>
-          {%- endif %}
-
-          {%- if theme.post_meta.updated_at.enable %}
-            {%- if not theme.post_meta.updated_at.another_day or date_diff or not theme.post_meta.created_at %}
-              <span class="post-meta-item">
-                <span class="post-meta-item-icon">
-                  <i class="far fa-calendar-check"></i>
-                </span>
-                <span class="post-meta-item-text">{{ __('post.edited') }}</span>
-                <time title="{{ __('post.modified') + __('symbol.colon') + full_date(post.updated) }}" itemprop="dateModified" datetime="{{ moment(post.updated).format() }}">{{ date(post.updated) }}</time>
-              </span>
-            {%- endif %}
-          {%- endif %}
-
-          {%- if post.categories and post.categories.length and theme.post_meta.categories %}
-            <span class="post-meta-item">
-              <span class="post-meta-item-icon">
-                <i class="far fa-folder"></i>
-              </span>
-              <span class="post-meta-item-text">{{ __('post.in') }}</span>
-              {%- for cat in post.categories.toArray() %}
-                <span itemprop="about" itemscope itemtype="http://schema.org/Thing">
-                  <a href="{{ url_for(cat.path) }}" itemprop="url" rel="index"><span itemprop="name">{{ cat.name }}</span></a>
-                </span>
-
-                {%- set cat_length = post.categories.length %}
-                {%- if cat_length > 1 and loop.index !== cat_length %}
-                  {{ __('symbol.comma') }}
-                {%- endif %}
-              {%- endfor %}
-            </span>
-          {%- endif %}
-
-          {# LeanCloud PageView #}
-          {%- if theme.leancloud_visitors.enable or (theme.valine.enable and theme.valine.visitor) %}
-            <span id="{{ url_for(post.path) }}" class="post-meta-item leancloud_visitors" data-flag-title="{{ post.title }}" title="{{ __('post.views') }}">
-              <span class="post-meta-item-icon">
-                <i class="far fa-eye"></i>
-              </span>
-              <span class="post-meta-item-text">{{ __('post.views') + __('symbol.colon') }}</span>
-              <span class="leancloud-visitors-count"></span>
-            </span>
-          {%- endif %}
-
-          {%- if theme.firestore.enable %}
-            <span class="post-meta-item" title="{{ __('post.views') }}">
-              <span class="post-meta-item-icon">
-                <i class="far fa-eye"></i>
-              </span>
-              <span class="post-meta-item-text">{{ __('post.views') + __('symbol.colon') }}</span>
-              <span class="firestore-visitors-count"></span>
-            </span>
-          {%- endif %}
-
-          {%- if not is_index and theme.busuanzi_count.enable and theme.busuanzi_count.post_views %}
-            <span class="post-meta-item" title="{{ __('post.views') }}" id="busuanzi_container_page_pv" style="display: none;">
-              <span class="post-meta-item-icon">
-                <i class="{{ theme.busuanzi_count.post_views_icon }}"></i>
-              </span>
-              <span class="post-meta-item-text">{{ __('post.views') + __('symbol.colon') }}</span>
-              <span id="busuanzi_value_page_pv"></span>
-            </span>
-          {%- endif %}
-
-          {{- next_inject('postMeta') }}
-
-          {%- if config.symbols_count_time.symbols %}
-          {%- if theme.symbols_count_time.separated_meta %}<br>{%- endif %}
-            <span class="post-meta-item" title="{{ __('symbols_count_time.count') }}">
-              <span class="post-meta-item-icon">
-                <i class="far fa-file-word"></i>
-              </span>
-              <span class="post-meta-item-text">{{ __('symbols_count_time.count') + __('symbol.colon') }}</span>
-              <span>{{ symbolsCount(post) }}</span>
-            </span>
-          {%- endif %}
-
-          {%- if config.symbols_count_time.time %}
-            <span class="post-meta-item" title="{{ __('symbols_count_time.time') }}">
-              <span class="post-meta-item-icon">
-                <i class="far fa-clock"></i>
-              </span>
-              <span class="post-meta-item-text">{{ __('symbols_count_time.time') }} &asymp;</span>
-              <span>{{ symbolsTime(post, config.symbols_count_time.awl, config.symbols_count_time.wpm, __('symbols_count_time.time_minutes')) }}</span>
-            </span>
-          {%- endif %}
-          </div>
+          {{ partial('_partials/post/post-meta.njk') }}
 
           {%- if post.description and (not theme.excerpt_description or not is_index) %}
             <div class="post-description">{{ post.description }}</div>
diff --git a/layout/_partials/post/post-meta.njk b/layout/_partials/post/post-meta.njk
new file mode 100644
index 0000000..73f8401
--- /dev/null
+++ b/layout/_partials/post/post-meta.njk
@@ -0,0 +1,109 @@
+<div class="post-meta">
+  {%- set date_diff = date(post.date) != date(post.updated) %}
+  {%- set time_diff = time(post.date) != time(post.updated) %}
+
+  {%- if theme.post_meta.created_at %}
+    <span class="post-meta-item">
+      <span class="post-meta-item-icon">
+        <i class="far fa-calendar"></i>
+      </span>
+      <span class="post-meta-item-text">{{ __('post.posted') }}</span>
+
+      {%- if not date_diff and time_diff and theme.post_meta.updated_at.enable and theme.post_meta.updated_at.another_day %}
+        {%- set create_title = __('post.created') + __('symbol.colon') + full_date(post.date) + ' / ' + __('post.modified') + __('symbol.colon') + time(post.updated) %}
+      {% else %}
+        {%- set create_title = __('post.created') + __('symbol.colon') + full_date(post.date) %}
+      {%- endif %}
+
+      <time title="{{ create_title }}" itemprop="dateCreated datePublished" datetime="{{ moment(post.date).format() }}">{{ date(post.date) }}</time>
+    </span>
+  {%- endif %}
+
+  {%- if theme.post_meta.updated_at.enable %}
+    {%- if not theme.post_meta.updated_at.another_day or date_diff or not theme.post_meta.created_at %}
+      <span class="post-meta-item">
+        <span class="post-meta-item-icon">
+          <i class="far fa-calendar-check"></i>
+        </span>
+        <span class="post-meta-item-text">{{ __('post.edited') }}</span>
+        <time title="{{ __('post.modified') + __('symbol.colon') + full_date(post.updated) }}" itemprop="dateModified" datetime="{{ moment(post.updated).format() }}">{{ date(post.updated) }}</time>
+      </span>
+    {%- endif %}
+  {%- endif %}
+
+  {%- if post.categories and post.categories.length and theme.post_meta.categories %}
+    <span class="post-meta-item">
+      <span class="post-meta-item-icon">
+        <i class="far fa-folder"></i>
+      </span>
+      <span class="post-meta-item-text">{{ __('post.in') }}</span>
+      {%- for cat in post.categories.toArray() %}
+        <span itemprop="about" itemscope itemtype="http://schema.org/Thing">
+          <a href="{{ url_for(cat.path) }}" itemprop="url" rel="index"><span itemprop="name">{{ cat.name }}</span></a>
+        </span>
+
+        {%- set cat_length = post.categories.length %}
+        {%- if cat_length > 1 and loop.index !== cat_length %}
+          {{ __('symbol.comma') }}
+        {%- endif %}
+      {%- endfor %}
+    </span>
+  {%- endif %}
+
+  {# LeanCloud PageView #}
+  {%- if theme.leancloud_visitors.enable or (theme.valine.enable and theme.valine.visitor) %}
+    <span id="{{ url_for(post.path) }}" class="post-meta-item leancloud_visitors" data-flag-title="{{ post.title }}" title="{{ __('post.views') }}">
+      <span class="post-meta-item-icon">
+        <i class="far fa-eye"></i>
+      </span>
+      <span class="post-meta-item-text">{{ __('post.views') + __('symbol.colon') }}</span>
+      <span class="leancloud-visitors-count"></span>
+    </span>
+  {%- endif %}
+
+  {%- if theme.firestore.enable %}
+    <span class="post-meta-item" title="{{ __('post.views') }}">
+      <span class="post-meta-item-icon">
+        <i class="far fa-eye"></i>
+      </span>
+      <span class="post-meta-item-text">{{ __('post.views') + __('symbol.colon') }}</span>
+      <span class="firestore-visitors-count"></span>
+    </span>
+  {%- endif %}
+
+  {%- if not is_index and theme.busuanzi_count.enable and theme.busuanzi_count.post_views %}
+    <span class="post-meta-item" title="{{ __('post.views') }}" id="busuanzi_container_page_pv" style="display: none;">
+      <span class="post-meta-item-icon">
+        <i class="{{ theme.busuanzi_count.post_views_icon }}"></i>
+      </span>
+      <span class="post-meta-item-text">{{ __('post.views') + __('symbol.colon') }}</span>
+      <span id="busuanzi_value_page_pv"></span>
+    </span>
+  {%- endif %}
+
+  {{- next_inject('postMeta') }}
+
+  {%- if config.symbols_count_time.symbols %}
+    {%- if theme.symbols_count_time.separated_meta %}
+      </div>
+      <div class="post-meta">
+    {%- endif %}
+    <span class="post-meta-item" title="{{ __('symbols_count_time.count') }}">
+      <span class="post-meta-item-icon">
+        <i class="far fa-file-word"></i>
+      </span>
+      <span class="post-meta-item-text">{{ __('symbols_count_time.count') + __('symbol.colon') }}</span>
+      <span>{{ symbolsCount(post) }}</span>
+    </span>
+  {%- endif %}
+
+  {%- if config.symbols_count_time.time %}
+    <span class="post-meta-item" title="{{ __('symbols_count_time.time') }}">
+      <span class="post-meta-item-icon">
+        <i class="far fa-clock"></i>
+      </span>
+      <span class="post-meta-item-text">{{ __('symbols_count_time.time') }} &asymp;</span>
+      <span>{{ symbolsTime(post, config.symbols_count_time.awl, config.symbols_count_time.wpm, __('symbols_count_time.time_minutes')) }}</span>
+    </span>
+  {%- endif %}
+</div>
diff --git a/source/css/_common/components/pages/breadcrumb.styl b/source/css/_common/components/pages/breadcrumb.styl
index be787ba..c0b6f7a 100644
--- a/source/css/_common/components/pages/breadcrumb.styl
+++ b/source/css/_common/components/pages/breadcrumb.styl
@@ -9,13 +9,13 @@ ul.breadcrumb {
     display: inline;
   }
 
-  li + li::before {
+  li:not(:first-child)::before {
     content: '/\00a0';
     font-weight: normal;
     padding: .5em;
   }
 
-  li + li:last-child {
+  li:last-child {
     font-weight: bold;
   }
 }
diff --git a/source/css/_common/components/post/post-header.styl b/source/css/_common/components/post/post-header.styl
index d2a88fb..24d6562 100644
--- a/source/css/_common/components/post/post-header.styl
+++ b/source/css/_common/components/post/post-header.styl
@@ -89,7 +89,7 @@
 }
 
 // .post-meta-item exists in .post-meta and footer
-.post-meta-item + .post-meta-item::before {
+.post-meta-item:not(:first-child)::before {
   content: '|';
   margin: 0 .5em;
 }