From c1e7e2884083234b60921adfb44c365d45acd80a Mon Sep 17 00:00:00 2001
From: Kazhnuz <kazhnuz@chlore.net>
Date: Mon, 23 Mar 2020 18:02:51 +0100
Subject: [PATCH] fix(blog): clean up the layout

---
 .../themes/blog/layout/_partial/article.ejs   | 23 ++++++-----
 .../blog/layout/_partial/post/category.ejs    |  4 +-
 .../themes/blog/layout/_partial/post/date.ejs |  4 +-
 .../themes/blog/layout/_partial/post/nav.ejs  | 40 +++++++++----------
 .../themes/blog/layout/_widget/archive.ejs    |  4 +-
 .../themes/blog/layout/_widget/category.ejs   |  2 +-
 .../blog/layout/_widget/recent_posts.ejs      |  2 +-
 src/blog/themes/blog/layout/_widget/tag.ejs   |  2 +-
 .../themes/blog/layout/_widget/tagcloud.ejs   |  2 +-
 9 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/src/blog/themes/blog/layout/_partial/article.ejs b/src/blog/themes/blog/layout/_partial/article.ejs
index 71ce27f..0df71c9 100644
--- a/src/blog/themes/blog/layout/_partial/article.ejs
+++ b/src/blog/themes/blog/layout/_partial/article.ejs
@@ -7,8 +7,8 @@
       </header>
     <% } %>
     <div class="article-meta">
-      <%- partial('post/date', {class_name: 'article-date', date_format: null}) %>
       <%- partial('post/category') %>
+      <%- partial('post/date', {class_name: 'article-date', date_format: null}) %>
     </div>
     <div class="article-entry" itemprop="articleBody">
       <% if (post.excerpt && index){ %>
@@ -22,19 +22,20 @@
         <%- post.content %>
       <% } %>
     </div>
-    <footer class="article-footer">
-      <a data-url="<%- post.permalink %>" data-id="<%= post._id %>" class="article-share-link"><%= __('share') %></a>
-      <% if (post.comments && config.disqus_shortname){ %>
-        <a href="<%- post.permalink %>#disqus_thread" class="article-comment-link"><%= __('comment') %></a>
-      <% } %>
-      <%- partial('post/tag') %>
-    </footer>
   </div>
-  <% if (!index){ %>
-    <%- partial('post/nav') %>
-  <% } %>
 </article>
 
+<footer class="article-footer">
+  <% if (post.comments && config.disqus_shortname){ %>
+    <a href="<%- post.permalink %>#disqus_thread" class="article-comment-link"><%= __('comment') %></a>
+  <% } %>
+  <%- partial('post/tag') %>
+</footer>
+
+<% if (!index){ %>
+  <%- partial('post/nav') %>
+<% } %>
+
 <% if (!index && post.comments && config.disqus_shortname){ %>
 <section id="comments">
   <div id="disqus_thread">
diff --git a/src/blog/themes/blog/layout/_partial/post/category.ejs b/src/blog/themes/blog/layout/_partial/post/category.ejs
index db2ed48..02b94d6 100644
--- a/src/blog/themes/blog/layout/_partial/post/category.ejs
+++ b/src/blog/themes/blog/layout/_partial/post/category.ejs
@@ -4,7 +4,7 @@
       show_count: false,
       class: 'article-category',
       style: 'none',
-      separator: '►'
+      separator: ''
     }) %>
   </div>
-<% } %>
\ No newline at end of file
+<% } %>
diff --git a/src/blog/themes/blog/layout/_partial/post/date.ejs b/src/blog/themes/blog/layout/_partial/post/date.ejs
index 3f49613..750f355 100644
--- a/src/blog/themes/blog/layout/_partial/post/date.ejs
+++ b/src/blog/themes/blog/layout/_partial/post/date.ejs
@@ -1,3 +1 @@
-<a href="<%- url_for(post.path) %>" class="<%= class_name %>">
-  <time datetime="<%= date_xml(post.date) %>" itemprop="datePublished"><%= date(post.date, date_format) %></time>
-</a>
\ No newline at end of file
+<time datetime="<%= date_xml(post.date) %>" itemprop="datePublished"><em><%= date(post.date, date_format) %></em></time>
diff --git a/src/blog/themes/blog/layout/_partial/post/nav.ejs b/src/blog/themes/blog/layout/_partial/post/nav.ejs
index 720798a..0016894 100644
--- a/src/blog/themes/blog/layout/_partial/post/nav.ejs
+++ b/src/blog/themes/blog/layout/_partial/post/nav.ejs
@@ -1,22 +1,22 @@
 <% if (post.prev || post.next){ %>
-<nav id="article-nav">
-  <% if (post.prev){ %>
-    <a href="<%- url_for(post.prev.path) %>" id="article-nav-newer" class="article-nav-link-wrap">
-      <strong class="article-nav-caption"><%= __('newer') %></strong>
-      <div class="article-nav-title">
-        <% if (post.prev.title){ %>
-          <%= post.prev.title %>
-        <% } else { %>
-          (no title)
-        <% } %>
-      </div>
-    </a>
-  <% } %>
-  <% if (post.next){ %>
-    <a href="<%- url_for(post.next.path) %>" id="article-nav-older" class="article-nav-link-wrap">
-      <strong class="article-nav-caption"><%= __('older') %></strong>
-      <div class="article-nav-title"><%= post.next.title %></div>
-    </a>
-  <% } %>
+<nav class="article-nav">
+  <div class="article-prev">
+    <% if (post.prev){ %>
+      <a href="<%- url_for(post.prev.path) %>" id="article-nav-newer" class="article-nav-link-wrap">
+          <% if (post.prev.title){ %>
+            <%= post.prev.title %>
+          <% } else { %>
+            (no title)
+          <% } %>
+      </a>
+    <% } %>
+  </div>
+  <div class="article-next">
+    <% if (post.next){ %>
+      <a href="<%- url_for(post.next.path) %>" id="article-nav-older" class="article-nav-link-wrap">
+        <%= post.next.title %>
+      </a>
+    <% } %>
+  </div>
 </nav>
-<% } %>
\ No newline at end of file
+<% } %>
diff --git a/src/blog/themes/blog/layout/_widget/archive.ejs b/src/blog/themes/blog/layout/_widget/archive.ejs
index c80bbe4..33a4daf 100644
--- a/src/blog/themes/blog/layout/_widget/archive.ejs
+++ b/src/blog/themes/blog/layout/_widget/archive.ejs
@@ -1,9 +1,9 @@
 <% if (site.posts.length){ %>
-  <div class="card card-primary">
+  <div class="card card-info">
     <div class="card-header"><%= __('archive_a') %></div>
     <div class="card-menu">
       <%- list_archives({show_count: theme.show_count,
-        type: theme.archive_type, style:"flat", class:"menu-element"}) %>
+        type: theme.archive_type, style:"list", class:"menu-element"}) %>
     </div>
   </div>
 <% } %>
diff --git a/src/blog/themes/blog/layout/_widget/category.ejs b/src/blog/themes/blog/layout/_widget/category.ejs
index 039ce28..945ad81 100644
--- a/src/blog/themes/blog/layout/_widget/category.ejs
+++ b/src/blog/themes/blog/layout/_widget/category.ejs
@@ -1,5 +1,5 @@
 <% if (site.categories.length){ %>
-  <div class="card card-primary">
+  <div class="card card-info">
     <div class="card-header"><%= __('categories') %></div>
     <div class="card-menu">
       <%- list_categories({show_count: theme.show_count}) %>
diff --git a/src/blog/themes/blog/layout/_widget/recent_posts.ejs b/src/blog/themes/blog/layout/_widget/recent_posts.ejs
index abf9ce0..81bb58f 100644
--- a/src/blog/themes/blog/layout/_widget/recent_posts.ejs
+++ b/src/blog/themes/blog/layout/_widget/recent_posts.ejs
@@ -1,5 +1,5 @@
 <% if (site.posts.length){ %>
-  <div class="card card-primary">
+  <div class="card card-info">
     <div class="card-header"><%= __('recent_posts') %></div>
     <div class="card-menu">
         <% site.posts.sort('date', -1).limit(5).each(function(post){ %>
diff --git a/src/blog/themes/blog/layout/_widget/tag.ejs b/src/blog/themes/blog/layout/_widget/tag.ejs
index b290bf9..9f4e05d 100644
--- a/src/blog/themes/blog/layout/_widget/tag.ejs
+++ b/src/blog/themes/blog/layout/_widget/tag.ejs
@@ -1,5 +1,5 @@
 <% if (site.tags.length){ %>
-  <div class="card card-primary">
+  <div class="card card-info">
     <h3 class="card-header"><%= __('tags') %></h3>
     <div class="card-menu">
       <%- list_tags({show_count: theme.show_count}) %>
diff --git a/src/blog/themes/blog/layout/_widget/tagcloud.ejs b/src/blog/themes/blog/layout/_widget/tagcloud.ejs
index b9f4eb1..f26b99a 100644
--- a/src/blog/themes/blog/layout/_widget/tagcloud.ejs
+++ b/src/blog/themes/blog/layout/_widget/tagcloud.ejs
@@ -1,5 +1,5 @@
 <% if (site.tags.length){ %>
-  <div class="card card-primary">
+  <div class="card card-info">
     <h3 class="card-header"><%= __('tagcloud') %></h3>
     <div class="card-body tagcloud">
       <%- tagcloud() %>