Finish merge and update gemfile.lock

This commit is contained in:
2020-07-14 22:38:32 -04:00
parent 489b8963c7
commit 24736726ce
7 changed files with 129 additions and 272 deletions

View File

@@ -1,3 +1,11 @@
PATH
remote: .
specs:
beautiful-jekyll-theme (4.0.1)
jekyll (~> 3.8)
jekyll-paginate (~> 1.1)
jekyll-sitemap (~> 1.4)
GEM
remote: https://rubygems.org/
specs:
@@ -9,12 +17,12 @@ GEM
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
ffi (1.12.2)
ffi (1.13.1)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.8.6)
jekyll (3.8.7)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@@ -30,6 +38,8 @@ GEM
jekyll-paginate (1.1.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (1.17.0)
@@ -40,11 +50,12 @@ GEM
mercenary (0.3.6)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.3)
rb-fsevent (0.10.3)
public_suffix (4.0.5)
rake (12.3.3)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rouge (3.17.0)
rouge (3.21.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
@@ -56,8 +67,9 @@ PLATFORMS
ruby
DEPENDENCIES
jekyll (~> 3.8.6)
jekyll-paginate
beautiful-jekyll-theme!
bundler (>= 1.16)
rake (~> 12.0)
BUNDLED WITH
2.0.2

View File

@@ -10,6 +10,7 @@ baseurl: ""
# Your name to show in the footer
author: Bryan Roessler
# --- List of links in the navigation bar --- #
navbar-links:
@@ -28,7 +29,7 @@ navbar-links:
#title-img: "./img/me_square_sepia_small.jpg"
# --- Background colour/image options --- #
avatar: "/img/me_square_sepia_small.jpg"
avatar: "/assets/img/me_square_sepia_small.jpg"
# By default, the image is cut into a circle. You can disable this behaviour by setting 'round-avatar: false'
round-avatar: true
@@ -179,6 +180,8 @@ highlighter: rouge
permalink: /:year-:month-:day-:title/
paginate: 5
plugins: [jekyll-paginate]
kramdown:
input: GFM
@@ -190,9 +193,9 @@ defaults:
type: "posts"
values:
layout: "post"
comments: true # add comments to all blog posts
comments: false # add comments to all blog posts
social-share: true # add social media sharing buttons to all blog posts
readtime: false # add estimated reading time on all blog posts
readtime: true # add estimated reading time on all blog posts
-
scope:
path: "" # all files
@@ -210,6 +213,7 @@ exclude:
- README.md
- screenshot.png
- docs/
- vendor/
# Beautiful Jekyll / Dean Attali

View File

@@ -5,3 +5,68 @@ subtitle:
use-site-title: false
---
<div class="posts-list">
{% for post in paginator.posts %}
<article class="post-preview">
<a href="{{ post.url | relative_url }}">
<h2 class="post-title">{{ post.title }}</h2>
{% if post.subtitle %}
<h3 class="post-subtitle">
{{ post.subtitle }}
</h3>
{% endif %}
</a>
<p class="post-meta">
Posted on {{ post.date | date: site.date_format }}
</p>
<div class="post-entry-container">
{% if post.image %}
<div class="post-image">
<a href="{{ post.url | relative_url }}">
<img src="{{ post.image | relative_url }}">
</a>
</div>
{% endif %}
<div class="post-entry">
{{ post.excerpt | strip_html | xml_escape | truncatewords: site.excerpt_length }}
{% assign excerpt_word_count = post.excerpt | number_of_words %}
{% if post.content != post.excerpt or excerpt_word_count > site.excerpt_length %}
<a href="{{ post.url | relative_url }}" class="post-read-more">[Read&nbsp;More]</a>
{% endif %}
</div>
</div>
{% if post.tags.size > 0 %}
<div class="blog-tags">
Tags:
{% if site.link-tags %}
{% for tag in post.tags %}
<a href="{{ '/tags' | relative_url }}#{{- tag -}}">{{- tag -}}</a>
{% endfor %}
{% else %}
{{ post.tags | join: ", " }}
{% endif %}
</div>
{% endif %}
</article>
{% endfor %}
</div>
{% if paginator.total_pages > 1 %}
<ul class="pager main-pager">
{% if paginator.previous_page %}
<li class="previous">
<a href="{{ paginator.previous_page_path | relative_url }}">&larr; Newer Posts</a>
</li>
{% endif %}
{% if paginator.next_page %}
<li class="next">
<a href="{{ paginator.next_page_path | relative_url }}">Older Posts &rarr;</a>
</li>
{% endif %}
</ul>
{% endif %}