From 07097c8537acf1c05bc13bcab0a6eb87ac00e14b Mon Sep 17 00:00:00 2001
From: Mimi <1119186082@qq.com>
Date: Sun, 25 Jul 2021 12:39:02 +0800
Subject: [PATCH] Install curlylint (#320)

* New element .post-meta-break
---
 .github/workflows/linter.yml                  |  7 ++++
 layout/_macro/sidebar.njk                     |  2 +-
 layout/_partials/post/post-meta.njk           |  8 ++---
 layout/_partials/sidebar/site-overview.njk    | 33 ++++++-------------
 .../_common/components/post/post-header.styl  |  7 +++-
 5 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 876c226..a24ca97 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -20,3 +20,10 @@ jobs:
       uses: coverallsapp/github-action@master
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Set up Python
+      uses: actions/setup-python@v2
+    - name: Install Dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install curlylint
+    - run: curlylint --include .njk layout
diff --git a/layout/_macro/sidebar.njk b/layout/_macro/sidebar.njk
index 3a654b6..f19a830 100644
--- a/layout/_macro/sidebar.njk
+++ b/layout/_macro/sidebar.njk
@@ -39,7 +39,7 @@
           </div>
         </div>
       </div>
-      
+
       {%- if theme.back2top.enable and theme.back2top.sidebar %}
         <div class="back-to-top animated" role="button" aria-label="{{ __('accessibility.back_to_top') }}">
           <i class="fa fa-arrow-up"></i>
diff --git a/layout/_partials/post/post-meta.njk b/layout/_partials/post/post-meta.njk
index 846091a..626f996 100644
--- a/layout/_partials/post/post-meta.njk
+++ b/layout/_partials/post/post-meta.njk
@@ -83,11 +83,11 @@
 
   {{- next_inject('postMeta') }}
 
+  {%- if theme.symbols_count_time.separated_meta and config.symbols_count_time.symbols and config.symbols_count_time.time %}
+    <span class="post-meta-break"></span>
+  {%- endif %}
+
   {%- 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>
diff --git a/layout/_partials/sidebar/site-overview.njk b/layout/_partials/sidebar/site-overview.njk
index 47bea75..8f3de41 100644
--- a/layout/_partials/sidebar/site-overview.njk
+++ b/layout/_partials/sidebar/site-overview.njk
@@ -12,11 +12,8 @@
   <nav class="site-state">
     {%- if config.archive_dir != '/' and site.posts.length > 0 %}
       <div class="site-state-item site-state-posts">
-        {%- if theme.menu.archives %}
-          <a href="{{ url_for(theme.menu.archives.split('||')[0] | trim) }}">
-        {% else %}
-          <a href="{{ url_for(config.archive_dir) }}">
-        {%- endif %}
+        {%- set archive_dir = theme.menu.archives.split('||')[0] | trim if theme.menu.archives else config.archive_dir + '/' %}
+        <a href="{{ url_for(archive_dir) }}">
           <span class="site-state-item-count">{{ site.posts.length }}</span>
           <span class="site-state-item-name">{{ __('state.posts') }}</span>
         </a>
@@ -27,12 +24,9 @@
       {%- set categoriesPageQuery = site.pages.find({type: 'categories'}, {lean: true}) %}
       {%- set hasCategoriesPage = categoriesPageQuery.length > 0 %}
       <div class="site-state-item site-state-categories">
+        {%- set category_dir = theme.menu.categories.split('||')[0] | trim if theme.menu.categories else config.category_dir + '/' %}
         {%- if hasCategoriesPage %}
-          {%- if theme.menu.categories %}
-            <a href="{{ url_for(theme.menu.categories.split('||')[0] | trim) }}">
-          {% else %}
-            <a href="{{ url_for(config.category_dir) + '/' }}">
-          {%- endif %}
+          <a href="{{ url_for(category_dir) }}">
         {%- endif %}
         <span class="site-state-item-count">{{ site.categories.length }}</span>
         <span class="site-state-item-name">{{ __('state.categories') }}</span>
@@ -44,12 +38,9 @@
       {%- set tagsPageQuery = site.pages.find({type: 'tags'}, {lean: true}) %}
       {%- set hasTagsPage = tagsPageQuery.length > 0 %}
       <div class="site-state-item site-state-tags">
+        {%- set tag_dir = theme.menu.tags.split('||')[0] | trim if theme.menu.tags else config.tag_dir + '/' %}
         {%- if hasTagsPage %}
-          {%- if theme.menu.tags %}
-            <a href="{{ url_for(theme.menu.tags.split('||')[0] | trim) }}">
-          {% else %}
-            <a href="{{ url_for(config.tag_dir) + '/' }}">
-          {%- endif %}
+          <a href="{{ url_for(tag_dir) }}">
         {%- endif %}
         <span class="site-state-item-count">{{ site.tags.length }}</span>
         <span class="site-state-item-name">{{ __('state.tags') }}</span>
@@ -62,14 +53,10 @@
 
 {%- if theme.chat.enable and (theme.chatra.enable or theme.tidio.enable or theme.gitter.enable) %}
   <div class="sidebar-button site-overview-item animated">
-  {%- if theme.chatra.enable or theme.tidio.enable %}
-    <button>
-  {%- elif theme.gitter.enable %}
-    <button class="js-gitter-toggle-chat-button">
-  {%- endif %}
-  {%- if theme.chat.icon %}<i class="{{ theme.chat.icon }}"></i>{%- endif %}
-    {{ theme.chat.text }}
-  </button>
+    <button{% if theme.gitter.enable %} class="js-gitter-toggle-chat-button"{% endif %}>
+      {%- if theme.chat.icon %}<i class="{{ theme.chat.icon }}"></i>{%- endif %}
+      {{ theme.chat.text }}
+    </button>
   </div>
 {%- endif %}
 
diff --git a/source/css/_common/components/post/post-header.styl b/source/css/_common/components/post/post-header.styl
index c4f3811..882010e 100644
--- a/source/css/_common/components/post/post-header.styl
+++ b/source/css/_common/components/post/post-header.styl
@@ -91,7 +91,7 @@
 }
 
 // .post-meta-item exists in .post-meta and footer
-.post-meta-item:not(:first-child)::before {
+:not(.post-meta-break) + .post-meta-item::before {
   content: '|';
   margin: 0 .5em;
 }
@@ -110,6 +110,11 @@
   }
 }
 
+.post-meta-break {
+  flex-basis: 100%;
+  height: 0;
+}
+
 if (hexo-config('busuanzi_count.enable') and hexo-config('busuanzi_count.post_views')) {
   #busuanzi_container_page_pv {
     display: none;