From 91c7fbe30ad5a85d7b005fd8324908d9646d7ab3 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Tue, 29 Oct 2019 17:05:28 +0800
Subject: [PATCH] Simplified trending tags structure.

---
 _includes/panel.html      | 44 ++++++++++++++++++++-------------------
 assets/css/_src/main.scss |  2 +-
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/_includes/panel.html b/_includes/panel.html
index f495fe1..0b48774 100644
--- a/_includes/panel.html
+++ b/_includes/panel.html
@@ -21,32 +21,34 @@
   {% endfor %}
 
   {% if lastmod_list.size > 0 %}
-  <div id="access-lastmod" class="post mb-4"">
-    <h3 data-toc-skip>
-      {{ site.data.label.panel.lastmod }}
-    </h3>
-    <ul class="post-content pl-0 pb-1 ml-1 mt-2">
+    <div id="access-lastmod" class="post mb-4"">
+      <h3 data-toc-skip>
+        {{- site.data.label.panel.lastmod -}}
+      </h3>
+      <ul class="post-content pl-0 pb-1 ml-1 mt-2">
     {% assign MAX_SIZE = 5 %}
     {% assign sum = 0 %}
     {% assign lastmod_list = lastmod_list | sort | reverse %}
     {% for item in lastmod_list %}
       {% assign index = item | split: "::" | last | plus: 0 %}
       {% assign post = site.posts[index] %}
-      <li><a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a></li>
+        <li><a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a></li>
       {% assign sum = sum | plus: 1 %}
       {% if sum >= MAX_SIZE %}
         {% break %}
       {% endif %}
     {% endfor %}
-    </ul>
-  </div><!-- #panel-update -->
+      </ul>
+    </div><!-- #access-lastmod -->
   {% endif %}
 
-  <div id="access-tags">
-    <h3 data-toc-skip>
-      {{ site.data.label.panel.trending_tags }}
-    </h3>
-    <div class="d-flex flex-wrap mt-2 pb-1 pr-3">
+    <div id="access-tags">
+
+      <h3 data-toc-skip>
+        {{- site.data.label.panel.trending_tags -}}
+      </h3>
+
+      <div class="d-flex flex-wrap mt-3 mb-1 mr-3">
       {% capture tags_array %}
         {% for tag in site.tags %}
           {{ tag[1] | size }}:{{ tag[0] | replace: ' ', '-' }}
@@ -57,7 +59,6 @@
       {% assign count = 0 %}
       {% assign trends = tags_array | split: " " | sort | reverse %}
 
-      <div>
       {% for trend in trends %}
         {% assign count = count | plus: 1 %}
         {% assign tag = trend | split: ":" | last  %}
@@ -66,19 +67,20 @@
           {% break %}
         {% endif %}
       {% endfor %}
-      </div>
 
-    </div>
-  </div><!-- #panel-tags -->
-</div>
+      </div> <!-- div.d-flex.flex-wrap -->
 
-{% if page.layout == 'post' and site.toc and page.toc %}
-<div id="toc-wrap" class="pl-0 pr-4">
+    </div> <!-- #access-tags -->
+
+  </div> <!-- .access -->
+
+  {% if page.layout == 'post' and site.toc and page.toc %}
+  <div id="toc-wrap" class="pl-0 pr-4">
     <h3 data-toc-skip class="pl-3 pt-2">
       {{- site.data.label.panel.toc -}}
     </h3>
     <nav id="toc" data-toggle="toc"></nav>
   </div>
-{% endif %}
+  {% endif %}
 
 </div> <!-- #panel-wrap -->
\ No newline at end of file
diff --git a/assets/css/_src/main.scss b/assets/css/_src/main.scss
index f6213aa..1ffaef7 100644
--- a/assets/css/_src/main.scss
+++ b/assets/css/_src/main.scss
@@ -431,7 +431,7 @@ footer .license a {
   border: 1px solid #e9ecef;
   border-radius: .8rem;
   padding: .3rem .5rem;
-  margin-bottom: .3rem;
+  margin: 0 .35rem .5rem 0;
 }
 
 #access-tags .post-tag:hover {