jekyll-theme-horizon-flow 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b1490345f03372f82de84d6e7cbf9bb019b71b7eaf29004d33864cc50056162
-  data.tar.gz: 3ca9974557e6cd103bbce7f55ec75cc35b5685aab2ec9a3e42f69839cd6653ff
+  metadata.gz: 9c647058ba28712037b2b276685ef637181cebaf265936fa6fe33851bfd33dbd
+  data.tar.gz: cecdc33724d7eb33c8f82f478b7350467521716b16928e03d178e3b586421794
 SHA512:
-  metadata.gz: 8748f115726697bef71a04e003b388606e6c41943e10eb678ba6562c6286d25ad2b04a213fcf55268688154201dd747bea7d72b1f9d06ba6aa0993a405a0d678
-  data.tar.gz: 05dcf53e6abff5e184cd946187f9b33e01c592b2c3c4e056241322b30bab813dc8eb0404a7e01e8d905a5e24b5f0e916310f62c8e8b1face7e24fa9935bde007
+  metadata.gz: 135dfa6cfba4c0de80dff89de1e9d8c9faea873f01614290b43c61b5546d1f1889232de0f1c9933ac1ec8443c97efca37189b93904f5a6a135beadef6821548e
+  data.tar.gz: 2bf8d58ff86af1d06aa699f6242c9d3491063dc32cb927eeafa73b5a6637c9aeaa14f6d0309c5354732c576c0cef54741f60d4752b23e1e4f95345dfe249ebe5

data/README.md

@@ -1,7 +1,5 @@
 # [Horizon Flow Jekyll Theme](https://papierkorp.github.io/jekyll-theme-horizon-flow/)
 
-<!-- MarkdownTOC -->
-
 - [Installation](#installation)
 - [Configuration](#configuration)
   - [Site URL](#site-url)
@@ -15,6 +13,7 @@
   - [Read Time](#read-time)
   - [default plugins](#default-plugins)
   - [Configurable Labels](#configurable-labels)
+  - [Comments](#comments)
 - [Front Matter](#front-matter)
 - [Layouts](#layouts-1)
   - [`layout: default`](#layout-default)
@@ -26,13 +25,11 @@
   - [`layout: tags`](#layout-tags)
 - [whislist](#whislist)
 
-<!-- /MarkdownTOC -->
-
-
 
 [![LICENSE](https://img.shields.io/badge/license-MIT-lightgrey.svg?style=flat-square)](https://raw.githubusercontent.com/papierkorp/jekyll-theme-horizon-flow/main/LICENSE.txt)
 [![Jekyll](https://img.shields.io/badge/jekyll-%3E%3D%203.6-blue.svg?style=flat-square)](https://jekyllrb.com/)
-[![Ruby gem](https://img.shields.io/gem/v/jekyll-theme-so-simple.svg?style=flat-square)](https://rubygems.org/gems/jekyll-theme-horizon-flow)
+[![Gem Version](https://badge.fury.io/rb/jekyll-theme-horizon-flow.svg)](https://badge.fury.io/rb/jekyll-theme-horizon-flow)
+
 
 This is my first ever theme or anything like this so I got a whole damn LOT of Inspiration and Ideas of the [So Simple](https://github.com/mmistakes/so-simple-theme/tree/master) theme from [mmistakes](https://github.com/mmistakes). Also i almost completly copied his readme pls forgive me <3.
 
@@ -40,20 +37,19 @@ This theme can offer:
 
 * Custom Navigation
 * Dynamically created Footer with Font Awesome Icons and Social Links
-* Flexible customizable Footer-Sidebar (above the Footer) where you can include up to 5 elements. You can choose between 4 premade ones and self created ones
+* optional, flexible and customizable Footer-Sidebar (above the Footer)
+* include up to 5 elements in the Footer-sidebar, choosen between 4 premade ones and self created ones
 * SEO best practices via [Jekyll SEO Tag](https://github.com/jekyll/jekyll-seo-tag)
-* Javascript free besides the optional search page
+* Javascript free besides the optional search page and the optional comments
 * supports tags and categories
 * offers an archive
 * Carefully designed posts for almost all Markup elements
 * Activateable TOC and to the TOP Buttons for each post
+* Mobile Friendly
+* Highly Customizable
+* optional server-free [Comments](https://www.aleksandrhovhannisyan.com/blog/jekyll-comment-system-github-issues/#how-to-add-comments-to-a-jekyll-blog) with Github Issues (hosted on Github)
 
 ![Horizon Flow Screenshots](https://papierkorp.github.io/jekyll-theme-horizon-flow/screenshot.png)
-![Horizon Flow Screenshots](https://papierkorp.github.io/jekyll-theme-horizon-flow/post.png)
-![Horizon Flow Screenshots](https://papierkorp.github.io/jekyll-theme-horizon-flow/post_toc.png)
-![Horizon Flow Screenshots](https://papierkorp.github.io/jekyll-theme-horizon-flow/categories.png)
-![Horizon Flow Screenshots](https://papierkorp.github.io/jekyll-theme-horizon-flow/tags.png)
-![Horizon Flow Screenshots](https://papierkorp.github.io/jekyll-theme-horizon-flow/archive.png)
 
 
 ## Installation
@@ -220,6 +216,7 @@ As for the possible Configurations this theme offers take note of the following:
 * [Read Time](#read-time)
 * [default plugins](#default-plugins)
 * [Configurable Labels](#configurable-labels)
+* [Comments](#comments)
 
 ### Site URL
 
@@ -371,7 +368,7 @@ footer_links:
 ### Layouts
 
 In here you can define the amount of columns used to display all tags/categories/years via the `_config`.
-Available values are `1-5`.
+Available values are `0-5`.
 
 ```yaml
 layouts:
@@ -387,7 +384,7 @@ layouts:
 ### Footer Sidebar
 
 The footer Sidebar is the content directly above the footer.
-Per default there are 4 elements available:
+Per default there are 6 elements available:
 
 **description:** Uses the `description:` of `_config` to display all the data from there. For the best experience you should use an <h1></h1> on the top.  
 **categories:** Shows random categories according to the count.  
@@ -410,6 +407,8 @@ description: >- # this means to ignore newlines until
   </p>
 
 footer_sidebar:
+  enabled: true
+  auto: false # false = all elements will have the same width, true = each element takes what it needs
   arrangement:  # you can rearrange the positions of the elements
   - description  # will be the first one to be displayed
   - tags  # second in the row ...
@@ -417,25 +416,34 @@ footer_sidebar:
   - recentposts  # will be displayed last
   description:
     enabled: true  # default: true
+    columns: 2  # default: 0 - if you include a list
   categories:
     enabled: true  # default: false
     count: 100  # default: 100
+    columns: 5  # default: 0
   tags:
     enabled: true  # default: false
     count: 100  # default: 100
+    columns: 5  # default: 0
   recentposts:
     enabled: true  # default: true
-    count: 10  # default: 10
+    count: 10  # default: 5
+    columns: 2  # default: 0
   custom_content:
     enabled: true
     data: >-
       <h3>EXTRACONTENT</h3>
       <p>not really content though...</p>
+    columns: 2  # default: 0 - if you include a list
   custom_content2:
     enabled: false
     data: "<h3>mhm</h3>"
+    columns: 2  # default: 0 - if you include a list
 ```
 
+The default of `0` stands for automatic alignment.
+
+
 ### Table of Contents
 
 Take a look at the [Front Matter](#front-matter) on how to disable the TOC.
@@ -520,6 +528,21 @@ categories_nothing_found: "No categories available."
 ```
 
 
+### Comments
+
+This theme enables the use of Comments per Github Issues API (taken from [here](https://www.aleksandrhovhannisyan.com/blog/jekyll-comment-system-github-issues/#how-to-add-comments-to-a-jekyll-blog)).
+To enable comments you will need the following Config:
+
+```yaml
+issues_repo: YourUsername/RepoName  # e.g.: issues_repo: papierkorp/blog
+```
+
+In addition you will have to open up a Issue for each blog post manually and copy the ID of this Issue.
+Afterwards add this Front Matter to your Post:
+
+```yaml
+comments_id: 1
+```
 
 ---
 
@@ -533,6 +556,7 @@ This theme offers the following Front-Matter:
 |--------|------------------|-----------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------|
 | `post` | subtitle         | Adds a subtitle to the post (optional)                                                                                      | ---<br>subtitle: "You're going to love this." <br>---                                        |
 | `post` | display_toc      | true or false, shows the toc button on the bottom right (default: true)                                                     | ---<br>display_toc: false <br>---                                                            |
+| `post` | display_toc2     | true or false, shows another toc on the right side permanently (default: false)                                             | ---<br>display_toc2: true <br>---                                                            |
 | `post` | last_modified_at | Add extra meta-data when the post was last modified. It takes the date as you write it like a string.                       | ---<br>last_modified_at: 10.09.2023 <br>---                                                  |
 | `post` | search_keywords  | Add extra data to the [search.json](#layout-:-search) file                                                                                | ---<br>search_keywords: "words i didnt use in the tags" <br>---                              |
 | `post` | toTop            | true or false, shows the "To the Top" button on the bottom left (default: true)                                             | ---<br>toTop: false <br>---                                                                  |
@@ -540,6 +564,7 @@ This theme offers the following Front-Matter:
 | `post` | noheader         | Disable the whole header and only show the Content. (default: false)                                                        | ---<br>noheader: true <br>---                                                                |
 | `post` | searchable       | The post wont be included in the search.                                                                                    | ---<br>searchable: false <br>---                                                             |
 | `post` | show_supplements | The supplements (date, readtime, tags...) wont be shown.                                                                    | ---<br>show_supplements: false<br><br>---                                                 |
+| `post` | comments_id      | If you want to enable comments (hosted on Github - needs the neccessary config set)                                         | ---<br>comments_id: 1<br><br>---                                                 |
 | `home` | noheader         | Disable the whole header and only show the Content. (default: false)                                                        | ---<br>noheader: true <br>---                                                                |
 
 --- 
@@ -610,9 +635,4 @@ There is no front matter for it.
 
 # whislist
 
-- footer
-  + make the columns in the footer-sidebar (tags, categories, recent posts) configurable
-  + fix for mobile screens
-- post
-  + fix TOC for mobile screens
 - more colors

data/_config.yml

@@ -54,13 +54,27 @@ plugins:
 #   - vendor/gems/
 #   - vendor/ruby/
 
+#------------------------------------AddOns------------------------------------
+
+issues_repo: papierkorp/blog
+
 #------------------------------------Horizon Flow specific------------------------------------
 
 navigation:
   - title: Home
     url: /index.html
+  - title: Categories
+    url: /categories.html
+  - title: Tags
+    url: /tags.html
+  - title: Archive
+    url: /archive.html
+  - title: Search
+    url: /search.html
 
 footer_sidebar:
+  enabled: true
+  auto: true
   arrangement:
   - description
   - tags
@@ -70,31 +84,41 @@ footer_sidebar:
     enabled: true
   categories:
     enabled: true
-    count: 100
-    columns: 1
   tags:
     enabled: true
-    count: 100
-    columns: 3
   recentposts:
     enabled: true
-    count: 10
-    columns: 2
 
 footer_links:
   - title: Feed
     url: /feed.xml
     icon: fa fa-rss
+  - title: GitHub
+    url: https://github.com/papierkorp
+    icon: fa fa-github
+  - title: Email
+    url: mailto:xxx@test.de
+    icon: fa fa-envelope
+  - title: Twitter
+    url: https://twitter.com
+    icon: fa fa-twitter
+  - title: Facebook
+    url: https://facebook.com
+    icon: fa fa-facebook
+  - title: Instagram
+    url: https://instagram.com
+    icon: fa fa-instagram
+  - title: Impressum
+    url: /impressum.html
 
 defaults:
   -
     scope:
       path: "_posts"
     values:
-      toc: yes
       display_toc: true
 
-paginate: 5
+paginate: 3
 paginate_path: "/:num/"
 
 read_time_after: "min read"

data/_includes/comments.html

@@ -0,0 +1,127 @@
+{% assign issues_repo = site.issues_repo %}
+{% assign issue_id = include.issue_id %}
+
+<section id="comments">
+  <div class="comment-actions">
+    <h2><span id="comments-count"></span> Comments</h2>
+    <a
+      class="comment_button"
+      href="https://github.com/{{ issues_repo }}/issues/{{ issue_id }}"
+      target="_blank"
+      >
+      Comment on Github
+      <i class="fa fa-external-link" aria-hidden="true">
+        
+      </i>
+    </a>
+  </div>
+  <div id="comments-wrapper">
+    Loading...
+  </div>
+</section>
+
+
+
+<script>
+const commentsSection = document.getElementById('comments');
+const commentsWrapper = commentsSection.querySelector('#comments-wrapper');
+const commentsCount = commentsSection.querySelector('#comments-count');
+
+const commentsObserver = new IntersectionObserver((entries, self) => {
+  entries.forEach((entry) => {
+    if (entry.isIntersecting) {
+      fetchComments(); // this is the important part
+      self.unobserve(entry.target);
+    }
+  });
+}, { rootMargin: '200px 0px 0px 0px' });
+
+commentsObserver.observe(commentsSection);
+
+const fetchComments = async () => {
+  try {
+    const comments = await (await fetch(
+      'https://api.github.com/repos/{{ issues_repo }}/issues/{{ issue_id }}/comments'
+    )).json();
+    initRenderComments(comments);
+  } catch (e) {
+    commentsWrapper.innerHTML = `<p>Unable to retrieve the comments for this post.</p>`;
+  }
+}
+
+const loadScript = (src) => {
+  const scriptElement = document.createElement('script');
+  document.body.appendChild(scriptElement);
+
+  return new Promise((resolve) => {
+    scriptElement.onload = resolve;
+
+    // Important to register onload before setting src
+    scriptElement.src = src;
+  });
+}
+
+const commentScripts = [
+  'https://unpkg.com/marked@0.3.6/marked.min.js',
+  'https://unpkg.com/dompurify@1.0.8/dist/purify.min.js',
+  'https://unpkg.com/dayjs@1.8.21/dayjs.min.js',
+  'https://unpkg.com/dayjs@1.7.8/plugin/relativeTime.js',
+];
+
+// Reminder: this gets called when the viewport intersects with the comments section
+const initRenderComments = async (comments) => {
+  if (!comments.length) {
+    commentsWrapper.innerHTML = `<p>No comments yet 👀 Be the first to post!</p>`;
+    return;
+  }
+
+  // Load all comment script dependencies async
+  await Promise.all(commentScripts.map((script) => loadScript(script)));
+  renderComments(comments);
+}
+
+const renderComments = (comments) => {
+  // load the relativeTime plugin for dayjs so we can express dates relative to now
+  dayjs.extend(dayjs_plugin_relativeTime);
+
+  commentsCount.innerText = `${comments.length}`;
+
+  const commentsList = document.createElement('ol');
+  commentsList.className = 'comments-list';
+  commentsList.setAttribute('aria-label', 'Comments on this blog post');
+
+  commentsList.innerHTML = comments
+  .sort((comment1, comment2) => {
+    return comment1.created_at < comment2.created_at ? 1 : -1;
+  })
+  .map(comment => {
+    const datePosted = dayjs(comment.created_at).fromNow();
+    const user = comment.user;
+    const body = DOMPurify.sanitize(marked(comment.body));
+    const postedByAuthor = comment.author_association === 'OWNER';
+    const edited = comment.created_at !== comment.updated_at;
+
+    return `<li class="comment">
+                <div class="commenter">
+                    <img src="${user.avatar_url}" alt="" aria-hidden="true" class="avatar" />
+                    <a
+                        href="https://github.com/${user.login}"
+                        class="username"
+                        target="_blank"
+                        >${user.login}</a
+                    >
+                    <div class="date-posted">commented <time datetime="${comment.created_at}">${datePosted}</time></div>
+                    ${postedByAuthor ? '<span class="tag author-badge">Author</span>' : ''}
+                    ${edited ? `<span class="comment-edited">Edited</span>` : ''}
+                </div>
+                <div class="comment-body">${body}</div>
+            </li>`;
+  })
+  .join('');
+
+  commentsWrapper.innerHTML = '';
+  commentsWrapper.appendChild(commentsList);
+}
+
+
+</script>

data/_includes/footer.html

@@ -9,77 +9,79 @@
 <footer>
 
 
-{% if site.footer_sidebar.arrangement %}
-  <aside class="footer_sidebar">
-    {% for section in site.footer_sidebar.arrangement %}
-      {% if section == 'description' and site.footer_sidebar.description.enabled %}
-        <section class="footer_sitedescription">
-          {{ site.description }}
-        </section>
-      {% elsif section == 'extracontent' and site.footer_sidebar.extracontent.enabled %}
-        <section class="footer_extracontent">
-          {{ site.footer_sidebar.extracontent.data }}
-        </section>
-      {% elsif section == 'extracontent2' and site.footer_sidebar.extracontent2.enabled %}
-        <section class="footer_extracontent">
-          {{ site.footer_sidebar.extracontent2.data }}
-        </section>
-      {% elsif section == 'categories' and site.footer_sidebar.categories.enabled %}
-        <section class="footer_categories">
-          <h3>Categories</h3>
-          <ul>
-            {% assign all_categories = "" %}
-            {% for post in site.posts %}
-              {% assign post_categories = post.categories %}
-              {% for category in post_categories %}
-                {% assign all_categories = all_categories | append: category | append: "," %}
+{% if site.footer_sidebar.enabled %}
+  {% if site.footer_sidebar.arrangement %}
+    <aside class="footer_sidebar footer_aside{% if site.footer_sidebar.auto %}_auto{% endif %}">
+      {% for section in site.footer_sidebar.arrangement %}
+        {% if section == 'description' and site.footer_sidebar.description.enabled %}
+          <section class="footer_sitedescription footer_sitedescription{% if site.footer_sidebar.description.columns and site.footer_sidebar.description.columns >= 0 and site.footer_sidebar.description.columns <= 5 %}{{site.footer_sidebar.description.columns}}{% else %}0{% endif %}">
+            {{ site.description }}
+          </section>
+        {% elsif section == 'customcontent' and site.footer_sidebar.customcontent.enabled %}
+          <section class="footer_customcontent footer_customcontent{% if site.footer_sidebar.customcontent.columns and site.footer_sidebar.customcontent.columns >= 0 and site.footer_sidebar.customcontent.columns <= 5 %}{{site.footer_sidebar.customcontent.columns}}{% else %}0{% endif %}">
+            {{ site.footer_sidebar.customcontent.data }}
+          </section>
+        {% elsif section == 'customcontent2' and site.footer_sidebar.customcontent2.enabled %}
+          <section class="footer_customcontent2 footer_customcontent2{% if site.footer_sidebar.customcontent2.columns and site.footer_sidebar.customcontent2.columns >= 0 and site.footer_sidebar.customcontent2.columns <= 5 %}{{site.footer_sidebar.customcontent2.columns}}{% else %}0{% endif %}">
+            {{ site.footer_sidebar.customcontent2.data }}
+          </section>
+        {% elsif section == 'categories' and site.footer_sidebar.categories.enabled %}
+          <section class="footer_categories footer_categories{% if site.footer_sidebar.categories.columns and site.footer_sidebar.categories.columns >= 0 and site.footer_sidebar.categories.columns <= 5 %}{{site.footer_sidebar.categories.columns}}{% else %}0{% endif %}">
+            <h3>Categories</h3>
+            <ul>
+              {% assign all_categories = "" %}
+              {% for post in site.posts %}
+                {% assign post_categories = post.categories %}
+                {% for category in post_categories %}
+                  {% assign all_categories = all_categories | append: category | append: "," %}
+                {% endfor %}
               {% endfor %}
-            {% endfor %}
-            {% assign unique_categories = all_categories | split: "," | uniq %}
-            
-            {% assign categories_count = site.footer_sidebar.categories.count | default: 100 %}
-            {% assign categories_to_display = unique_categories | slice: 0, categories_count %}
-            
-            {% for category in categories_to_display %}
-              <li><a href="{{ site.baseurl }}/categories.html#{{ category }}">{{ category }}</a></li>
-            {% endfor %}
-          </ul>
-        </section>
-      {% elsif section == 'tags' and site.footer_sidebar.tags.enabled %}
-        <section class="footer_tags">
-          <h3>Tags</h3>
-          <ul>
-            {% assign all_tags = "" %}
-            {% for post in site.posts %}
-              {% assign post_tags = post.tags %}
-              {% for tag in post_tags %}
-                {% assign all_tags = all_tags | append: tag | append: "," %}
+              {% assign unique_categories = all_categories | split: "," | uniq %}
+              
+              {% assign categories_count = site.footer_sidebar.categories.count | default: 100 %}
+              {% assign categories_to_display = unique_categories | slice: 0, categories_count %}
+              
+              {% for category in categories_to_display %}
+                <li><a href="{{ site.baseurl }}/categories.html#{{ category }}">{{ category }}</a></li>
               {% endfor %}
-            {% endfor %}
-            {% assign unique_tags = all_tags | split: "," | uniq %}
-            
-            {% assign tags_count = site.footer_sidebar.tags.count | default: 100 %}
-            {% assign tags_to_display = unique_tags | slice: 0, tags_count %}
-            
-            {% for tag in tags_to_display %}
-              <li><a href="{{ site.baseurl }}/tags#{{ tag }}">{{ tag }}</a></li>
-            {% endfor %}
-          </ul>
-        </section>
-      {% elsif section == 'recentposts' and site.footer_sidebar.recentposts.enabled %}
-        <section class="footer_recentposts">
-          <h3>Recent Posts</h3>
-          <ul>
-            {% assign recentposts_count = site.footer_sidebar.recentposts.count | default: 10 %}
-            {% assign recent_posts = site.posts | reverse | limit: recentposts_count %}
-            {% for post in recent_posts %}
-              <li><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a></li>
-            {% endfor %}
-          </ul>
-        </section>
-      {% endif %}
-    {% endfor %}
-  </aside>
+            </ul>
+          </section>
+        {% elsif section == 'tags' and site.footer_sidebar.tags.enabled %}
+          <section class="footer_tags footer_tags{% if site.footer_sidebar.tags.columns and site.footer_sidebar.tags.columns >= 0 and site.footer_sidebar.tags.columns <= 5 %}{{site.footer_sidebar.tags.columns}}{% else %}0{% endif %}">
+            <h3>Tags</h3>
+            <ul>
+              {% assign all_tags = "" %}
+              {% for post in site.posts %}
+                {% assign post_tags = post.tags %}
+                {% for tag in post_tags %}
+                  {% assign all_tags = all_tags | append: tag | append: "," %}
+                {% endfor %}
+              {% endfor %}
+              {% assign unique_tags = all_tags | split: "," | uniq %}
+              
+              {% assign tags_count = site.footer_sidebar.tags.count | default: 100 %}
+              {% assign tags_to_display = unique_tags | slice: 0, tags_count %}
+              
+              {% for tag in tags_to_display %}
+                <li><a href="{{ site.baseurl }}/tags#{{ tag }}">{{ tag }}</a></li>
+              {% endfor %}
+            </ul>
+          </section>
+        {% elsif section == 'recentposts' and site.footer_sidebar.recentposts.enabled %}
+          <section class="footer_recentposts footer_recentposts{% if site.footer_sidebar.recentposts.columns and site.footer_sidebar.recentposts.columns >= 0 and site.footer_sidebar.recentposts.columns <= 5 %}{{site.footer_sidebar.recentposts.columns}}{% else %}0{% endif %}">
+            <h3>Recent Posts</h3>
+            <ul>
+              {% assign recentposts_count = site.footer_sidebar.recentposts.count | default: 5 %}
+              {% assign recent_posts = site.posts | reverse %}
+              {% for post in recent_posts limit:recentposts_count %}
+                <li><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a></li>
+              {% endfor %}
+            </ul>
+          </section>
+        {% endif %}
+      {% endfor %}
+    </aside>
+  {% endif %}
 {% endif %}
 
 
@@ -101,4 +103,4 @@
   </div>
   {% endif %}
 
-</footer>
+</footer>

data/_layouts/archive.html

@@ -8,7 +8,7 @@ layout: default
 
     {% if site.posts.size > 0 %}
     <!-- show all years -->
-    <div class="archive_all_years{% if site.layouts.archive.columns and site.layouts.archive.columns >= 1 and site.layouts.archive.columns <= 5 %}{{site.layouts.archive.columns}}{% else %}2{% endif %}">
+    <div class="archive_all_years archive_all_years{% if site.layouts.archive.columns and site.layouts.archive.columns >= 1 and site.layouts.archive.columns <= 5 %}{{site.layouts.archive.columns}}{% else %}2{% endif %}">
       <ul>
         {% assign postsByYear = site.posts | group_by_exp: 'post', 'post.date | date: "%Y"' %}
         {% for year in postsByYear %}
@@ -52,16 +52,12 @@ layout: default
 
             <div class="archive_findresults">
 
-              <span class="archive_date">
+             
 
-                <a href="{{ site.baseurl }}{{ post.url }}">
-                  <i class="archive_day">{{ post.date | date: "%d" }}</i>
-                </a>
-                <a href="{{ site.baseurl }}{{ post.url }}">
-                  <span>{{ post.date | date: "%b/%Y" }}</span>
-                </a>
-
-              </span>
+              <a class="archive_date" href="{{ site.baseurl }}{{ post.url }}">
+                <i class="archive_day">{{ post.date | date: "%d" }}</i>
+                <span>{{ post.date | date: "%b/%Y" }}</span>
+              </a>
 
               <span class="archive_summary">
                 <h3>

data/_layouts/categories.html

@@ -17,7 +17,7 @@ layout: default
 
     {% if sortedCategories.size > 0 %}
     <!-- Show all categories sorted by count -->
-    <div class="categories_all{% if site.layouts.categories.columns and site.layouts.categories.columns >= 1 and site.layouts.categories.columns <= 5 %}{{site.layouts.categories.columns}}{% else %}3{% endif %}">
+    <div class="categories_all categories_all{% if site.footer_sidebar.categories.columns and site.footer_sidebar.categories.columns >= 1 and site.footer_sidebar.categories.columns <= 5 %}{{site.footer_sidebar.categories.columns}}{% else %}3{% endif %}">
       <ul>
         {% for category in sortedCategories %}
           {% assign categoryParts = category | split: '&#x1F;' %}
@@ -55,16 +55,10 @@ layout: default
 
           {% for post in category[1] %}
             <div class="categories_findresult">
-              <span class="categories_date">
-
-                <a href="{{ site.baseurl }}{{ post.url }}">
-                  <i class="categories_day">{{ post.date | date: "%d" }}</i>
-                </a>
-                <a href="{{ site.baseurl }}{{ post.url }}">
-                  <span>{{ post.date | date: "%b/%Y" }}</span>
-                </a>
-
-              </span>
+              <a href="{{ site.baseurl }}{{ post.url }}" class="categories_date">
+                <i class="categories_day">{{ post.date | date: "%d" }}</i>
+                <span>{{ post.date | date: "%b/%Y" }}</span>
+              </a>
 
               <span class="categories_summary">
                 <h3>

data/_layouts/home.html

@@ -42,16 +42,17 @@ layout: default
 				</p>
 				
 			</article>
+			<hr class="article-divider">
 		{% endfor %}
 
 		<!-- Pagination links -->
 		<div class="pagination">
 			{% if paginator.previous_page %}
-				<a class="previous" href="{{ site.baseurl}}{{ paginator.previous_page_path }}"><span class="spanprevious"><i class="arrow left" title="previous page"></i></span></a>
+				<a class="previous" href="{{ site.baseurl}}{{ paginator.previous_page_path }}"><span class="spanprevious"><i class="fa fa-arrow-left" title="previous page"></i></span></a>
 			{% endif %}
 				<p class="page_count">{{ paginator.page }} / {{ paginator.total_pages }}</p>
 			{% if paginator.next_page %}
-				<a class="next" href="{{ site.baseurl}}{{ paginator.next_page_path }}"><span class="spannext"><i class="arrow right" title="next page"></i></span></a>
+				<a class="next" href="{{ site.baseurl}}{{ paginator.next_page_path }}"><span class="spannext"><i class="fa fa-arrow-right" title="next page"></i></span></a>
 			{% endif %}
 		</div>
 	</section>