From ac5fb2492be449c5603818fe2f7ce326318a740f Mon Sep 17 00:00:00 2001
From: lostinlight <hello@libenter.win>
Date: Thu, 22 Mar 2018 04:41:55 +0300
Subject: [PATCH] Edit 404 page, fix tags page

---
 themes/starter/languages/en.yml               |  1 +
 themes/starter/layout/404.ejs                 |  3 ++-
 themes/starter/layout/_partial/taglist.ejs    |  3 ++-
 themes/starter/layout/archive.ejs             |  1 +
 themes/starter/layout/tag.ejs                 | 21 +++++++------------
 themes/starter/layout/tags.ejs                | 15 +++++++------
 themes/starter/source/assets/scss/main.scss   |  1 +
 .../source/assets/scss/modules/_404.scss      |  3 ++-
 .../source/assets/scss/modules/_tags.scss     |  8 +++++++
 9 files changed, 31 insertions(+), 25 deletions(-)
 create mode 100644 themes/starter/source/assets/scss/modules/_tags.scss

diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml
index 7438409..70754aa 100644
--- a/themes/starter/languages/en.yml
+++ b/themes/starter/languages/en.yml
@@ -34,6 +34,7 @@ theChronicles: The Chronicles
 primary: your primary source of news
 subscribe: Subscribe via RSS
 submit: Submit news
+tags: Tags
 wanted: WANTED
 featured: FEATURED
 news: IN THE NEWS
diff --git a/themes/starter/layout/404.ejs b/themes/starter/layout/404.ejs
index bc2919b..83fdbc7 100644
--- a/themes/starter/layout/404.ejs
+++ b/themes/starter/layout/404.ejs
@@ -1,8 +1,9 @@
+
 ---
 layout: layout
 ---
 
-<div class="card error__card">
+<div class="error__page">
   <h1 class="">404</h1>
   <h2>This isn't the page you're looking for.</h2>
   <h4><a href="/">Go back?</a></h4>
diff --git a/themes/starter/layout/_partial/taglist.ejs b/themes/starter/layout/_partial/taglist.ejs
index 55a631b..b337ad4 100644
--- a/themes/starter/layout/_partial/taglist.ejs
+++ b/themes/starter/layout/_partial/taglist.ejs
@@ -1,7 +1,8 @@
 
+
 <% posts.forEach(function(item) { %>
   <li class="tags__item">
-    <span class="tag__date"><%= item.date.format(config.date_format) %></span>
+    <span class="tag__date"><%= item.date.format(config.date_format).split('-').join('.') %></span>
     <a href="<%- config.root %><%- item.path %>" class="title">
       <%- item.title || "Untitled" %>
     </a>
diff --git a/themes/starter/layout/archive.ejs b/themes/starter/layout/archive.ejs
index 802232e..55bbdb8 100644
--- a/themes/starter/layout/archive.ejs
+++ b/themes/starter/layout/archive.ejs
@@ -14,6 +14,7 @@ layout: layout
   <ul class="links">
     <li><a href="<%= config.url%>/atom.xml"><%- __('subscribe') %></a></li>
     <li><a href="https://gitlab.com/fediverse/fediverse.gitlab.io/merge_requests"><%- __('submit') %></a></li>
+    <li><a href="/tags"><%- __('tags') %></a></li>
   </ul>
 
   <% page.posts.each(function(post) { %>
diff --git a/themes/starter/layout/tag.ejs b/themes/starter/layout/tag.ejs
index aa96415..b53d2be 100644
--- a/themes/starter/layout/tag.ejs
+++ b/themes/starter/layout/tag.ejs
@@ -1,5 +1,6 @@
+
 <%
-  var title = '';
+  let title = '';
   if (page.category) title = page.category;
   if (page.tag) title = "#" + page.tag;
   if (page.archive) {
@@ -8,28 +9,20 @@
   }
 %>
 
-<header class="intro-header" style="background-image: url('<%= config.root %><%= page.banner || config.banner %>')">
-  <h1>Tags</h1>
-</header>
-
-<div class="container-wrapper">
-
+<div class="contents">
   <div class="tags__cloud">
-    <% site.tags.map(function(tag){  %>
-      <a href="/tags/<%= tag.name %>" <% if (page.path === "tags/" + tag.name + "/index.html") { %>  class="tag--current" <% } %> ><%= tag.name %></a>
+    <% site.tags.map(function(tag) {  %>
+      #<a href="/tags/<%= tag.name %>" <% if (page.path === "tags/" + tag.name + "/index.html") { %>  class="tag--current" <% } %> ><%= tag.name %></a>
     <% }) %>
   </div>
-
   <div class="one-tag-list">
     <span class="tag__text"><%= title %></span>
-
-    <% var groupObj = _.groupBy(page.posts.toArray(), function(p){return -p.date.format('YYYY')}) %>
-    <% for (var year in groupObj){ %>
+    <% const groupObj = _.groupBy(page.posts.toArray(), function(p) {return -p.date.format('YYYY')}) %>
+    <% for (let year in groupObj){ %>
       <h3 class="tags__year"><%- -year %></h3>
       <ul class="tags__list">
         <%- partial('_partial/taglist', {posts: groupObj[year]}) %>
       </ul>
     <% } %>
    </div>
-
 </div>
diff --git a/themes/starter/layout/tags.ejs b/themes/starter/layout/tags.ejs
index f4e9375..e3e0f24 100644
--- a/themes/starter/layout/tags.ejs
+++ b/themes/starter/layout/tags.ejs
@@ -1,23 +1,22 @@
+
 ---
 layout: layout
 ---
 
-<div class="container-wrapper">
-
+<div class="contents">
   <div class="tags__cloud">
     <% site.tags.map(function(tag) { %>
-      <a href="/tags/<%= tag.name %>"><%= tag.name %></a>
+      #<a href="/tags/<%= tag.name %>"><%= tag.name %></a>
     <% }) %>
   </div>
-
   <div class="one-tag-list">
-    <% var groupObj = _.groupBy(site.posts.toArray(), function(p){return -p.date.format('YYYY')}) %>
-    <% for (var year in groupObj){ %>
+    <% const groupObj = _.groupBy(site.posts.toArray(), function(p){return -p.date.format('YYYY')}) %>
+
+    <% for (let year in groupObj){ %>
       <h3 class="tags__year"><%- -year %></h3>
       <ul class="tags__list">
-        <%- partial('_partial/taglist', {posts: groupObj[year]}) %>
+        <%- partial('_partial/taglist', {posts: _.sortBy(groupObj[year], 'date').reverse()}) %>
       </ul>
     <% } %>
    </div>
-
 </div>
diff --git a/themes/starter/source/assets/scss/main.scss b/themes/starter/source/assets/scss/main.scss
index 989f008..e46d4a5 100644
--- a/themes/starter/source/assets/scss/main.scss
+++ b/themes/starter/source/assets/scss/main.scss
@@ -10,6 +10,7 @@
 @import "modules/footer";
 @import "modules/index";
 @import "modules/404";
+@import "modules/tags";
 @import "modules/heroheader";
 @import "modules/buttons";
 @import "modules/network";
diff --git a/themes/starter/source/assets/scss/modules/_404.scss b/themes/starter/source/assets/scss/modules/_404.scss
index fa31b49..83eb826 100644
--- a/themes/starter/source/assets/scss/modules/_404.scss
+++ b/themes/starter/source/assets/scss/modules/_404.scss
@@ -1,4 +1,5 @@
 
-.error__card {
+.error__page {
   text-align: center;
+  padding-top: 4em;
 }
diff --git a/themes/starter/source/assets/scss/modules/_tags.scss b/themes/starter/source/assets/scss/modules/_tags.scss
new file mode 100644
index 0000000..fb74aa7
--- /dev/null
+++ b/themes/starter/source/assets/scss/modules/_tags.scss
@@ -0,0 +1,8 @@
+
+.tags__cloud {
+  margin: 5em 0 2em;
+}
+
+.tag__date {
+  margin-right: 1em;
+}