Merge branch 'master' of https://git.ellpeck.de/Ellpeck/Web
All checks were successful
Web/pipeline/head This commit looks good

This commit is contained in:
Ell 2021-12-04 16:38:42 +01:00
commit fd87a3c42b
9 changed files with 32 additions and 8 deletions

View file

@ -14,7 +14,7 @@ RewriteBase /
RewriteRule ^blog-(.*)$ "https://ellpeck.de/blog/$1" [R=301,L]
RewriteRule ^minecraft-stuff/?$ "https://ellpeck.de/projects" [R=301,L]
RewriteRule ^mc/?$ "https://ellpeck.de/projects" [R=301,L]
RewriteRule ^press/?(.*)$ "https://press.ellpeck.de/$1" [R=301,L]
RewriteRule ^press(/.*)?$ "https://press.ellpeck.de$1" [R=301,L]
RewriteRule ^tinylife/?$ "https://tinylifegame.com" [R=301,L]
RewriteRule ^foefrenzy/?$ "https://store.steampowered.com/app/1194170/" [R=301,L]

View file

@ -6,3 +6,4 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
gem "jekyll"
gem "webrick"
gem 'jekyll-feed'

View file

@ -29,6 +29,8 @@ GEM
rouge (~> 3.0)
safe_yaml (~> 1.0)
terminal-table (~> 2.0)
jekyll-feed (0.15.1)
jekyll (>= 3.7, < 5.0)
jekyll-sass-converter (2.1.0)
sassc (> 2.0.1, < 3.0)
jekyll-watch (2.2.1)
@ -63,6 +65,7 @@ PLATFORMS
DEPENDENCIES
jekyll
jekyll-feed
webrick
BUNDLED WITH

View file

@ -1,4 +1,9 @@
permalink: blog/:title
plugins:
- jekyll-feed
# markdown formatting
kramdown:
header_offset: 1
typographic_syms:
@ -7,3 +12,11 @@ kramdown:
ndash: --
laquo: "<<"
raquo: ">>"
# atom feed information
url: https://ellpeck.de
title: Ellpeck.de
description: Ellpeck's little internet place
author: Ellpeck
feed:
posts_limit: 100

View file

@ -8,8 +8,8 @@
<h1>📔 Blog</h1>
<p>
This is my blog, where I post about gaming, programming and life. The featured posts are the ones you'll probably be most interested in, but you can select a different category to see every post.
<br><em>Please be advised that some posts, especially short stories, may contain mature content.</em>
</p>
<p>📰 You can also subscribe to this blog through the <a href="/feed.xml">Atom Feed</a>.</p>
<div id="blog-cats">
{% include tagbtn.html tag="All" %}
{%- assign sorted = site.tags | sort -%}

View file

@ -18,8 +18,9 @@
<a class="nav-item nav-link" href="../#blog-{{ tag | slugify }}">🏠 Back to Main Page</a>
{% if prev %}
<a class="nav-item nav-link" href="{{ posts[prev].url }}">⏮️ Previous {{ tag }} Post</a>
<a class="nav-item nav-link" href="{{ posts[prev].url }}">⏮️ Previous in {{ tag }}</a>
{% endif %}
{% if next %}
<a class="nav-item nav-link" href="{{ posts[next].url }}">⏭️ Next {{ tag }} Post</a>
<a class="nav-item nav-link" href="{{ posts[next].url }}">⏭️ Next in {{ tag }}</a>
{% endif %}
<a class="nav-item nav-link" href="/feed.xml">📰 Atom Feed</a>

View file

@ -17,11 +17,15 @@ nav: nav/blognav.html
<h1>{{ page.title }}</h1>
{% if page.archived %}
<p><i>This post has been archived.</i></p>
<p>🧓 <em>This post has been archived.</em></p>
{% endif %}
{% if page.mature %}
<p>⚠️ <em>This post contains mature content.</em></p>
{% endif %}
{% if page.reedsy %}
<p><i>This story was inspired by a Reedsy Prompt and submitted to their competition. As such, it has also been published on <a href="{{ page.reedsy }}">their website</a>.</i></p>
<p>📘 <em>This story was inspired by a Reedsy Prompt and submitted to their competition. As such, it has also been published on <a href="{{ page.reedsy }}">their website</a>.</em></p>
{% endif %}
<div class="post-content">
@ -30,7 +34,7 @@ nav: nav/blognav.html
<span class="text-muted project-status blog-isolated-status">{{ page.date | date_to_string }}</span>
{% if page.discuss %}
<a href="{{ page.discuss }}" class="blog-discuss">Discuss this post</a>
🧵 <a href="{{ page.discuss }}" class="blog-discuss">Discuss this post</a>
{% endif %}
</div>
</div>

View file

@ -4,6 +4,7 @@ title: 🎉 Vince, a Party and Brandon
summary: "Vincent is an anxious introvert who is desperate to find a guy to have some fun with. At his best friend's party, he gets the chance to do just that, but his anxiety threatens to screw it all up."
tags: [Short Stories, Featured]
book: true
mature: true
reedsy: https://blog.reedsy.com/creative-writing-prompts/contests/104/submissions/78425/
discuss: https://twitter.com/Ellpeck/status/1419838270909865985
---

View file

@ -4,6 +4,7 @@ title: 📅 Jed's Things to Avoid in Life
summary: "Jed's rules are clear: No relationships. They interfere too much with his life, and he's not made for them anyway. But then, he sees his old crush from school in his hometown. Will he break his own rules for Davy?"
tags: [Short Stories]
book: true
mature: true
reedsy: https://blog.reedsy.com/creative-writing-prompts/contests/90/submissions/63882/
discuss: https://twitter.com/Ellpeck/status/1385686796911185920
---