Merge branch 'master' of https://git.ellpeck.de/Ellpeck/Web

main/_config.yaml

@@ -16,7 +16,7 @@ kramdown:
 # atom feed information
 url: https://ellpeck.de
 title: Ellpeck.de
-description: Ellpeck's little internet place
+description: Ell's Little Internet Place
 author: Ellpeck
 feed:
-  posts_limit: 100
+  posts_limit: 10000

main/_data/about.json

@@ -1,4 +1,5 @@
-[{
+[
+    {
         "q": "What are your pronouns?",
         "a": "I'm cis male, so I go by he/him most of the time. I don't really mind though, so you can use any pronouns."
     },
@@ -14,6 +15,10 @@
         "q": "Why are you called Ellpeck?",
         "a": "Well, it actually isn't as interesting of a story as some of you might hope. Long story short, when I was little (and was, apparently, very bad at English), I decided to make a YouTube channel called \"LetsPlayEveryGames.\" Shortly after, I also made a Minecraft account that I was going to call the same thing. At the time, though, there was a limit for how many characters your name could have, and so I opted for calling myself \"LPEG\" instead. When a friend of mine came along and started trying to pronounce that name, instead of saying each individual letter on its own, he started pronouncing it like a word: Ell-Peg. ...Ellpeck. I liked that pronounciation and so I stuck with the name."
     },
+    {
+        "q": "What should I call you?",
+        "a": "In general, most of my friends online call me Ell nowadays, which is also what I go by on Twitter and Discord in terms of my display names. My boyfriend calls me Peck online, but I generally don't like it when other people do so. If we meet in real life, you can call me Ell or Julian, the latter of which is my real name."
+    },
     {
         "q": "What languages do you speak?",
         "a": "I speak German, English, Java and C# fluently. I'm okay at JavaScript and Python, and I can just about write something in C, HTML, CSS and Lua."

main/_includes/blog.html

@@ -9,7 +9,7 @@
     <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.
     </p>
-    <p>📰 You can also subscribe to this blog through the <a href="/feed.xml">Atom Feed</a>.</p>
+    <p>📫 You can also subscribe to this blog through the <a href="https://ell.lt/lists">mailing list</a> or the <a href="/feed.xml">Atom Feed</a>.</p>
     <div id="blog-cats">
         {% include tagbtn.html tag="All" %}
         {%- assign sorted = site.tags | sort -%}

main/_includes/nav/blognav.html

@@ -23,4 +23,3 @@
 {% if next %}
 <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>

main/_layouts/blog.html

@@ -38,3 +38,25 @@ nav: nav/blognav.html
         {% endif %}
     </div>
 </div>
+
+<div class="alert alert-success mail-alert">
+    <h3>📫 Subscribe</h3>
+    <p>If you liked this blog post, you can subscribe to the mailing list to be notified of new posts and occasional special content. I promise not to send too many emails, but you can always unsubscribe easily, too.</p>
+
+    <form method="post" action="https://lists.ellpeck.de/subscription/form" class="listmonk-form text-center">
+        <div>
+            <input type="hidden" name="nonce">
+            <p><input type="email" name="email" required placeholder="E-mail"></p>
+            <p><input type="text" name="name" placeholder="Name (optional)"></p>
+
+            <p>
+                <input id="d3ee1" type="checkbox" name="l" checked value="d3ee16aa-f47a-43bd-a0d6-759d108a5650" />
+                <label for="d3ee1">📔 Ellpeck's Blog</label>
+            </p>
+
+            <p><input type="submit" value="Subscribe"></p>
+        </div>
+    </form>
+
+    <p>📰 Alternatively, you can also subscribe to this blog through the <a href="/feed.xml">Atom Feed</a>.</p>
+</div>

main/index.html

@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Ellpeck.de
-description: Ellpeck's little internet place
+description: Ell's Little Internet Place
 nav: nav/indexnav.html
 ---
 
@@ -15,7 +15,7 @@ nav: nav/indexnav.html
             <div class="col">
                 <h1 class="display-4" id="intro-text"></h1>
                 <script src="./scripts/greet.js"></script>
-                <p class="lead">Welcome to my little website! I'm Ellpeck, a student and programmer from Germany. I do a lot of stuff, actually. My life is pretty busy.</p>
+                <p class="lead">Welcome to my little website! I'm Ellpeck, though I usually go by Ell. I'm a student and programmer from Germany. I do a lot of stuff, actually. My life is pretty busy.</p>
             </div>
         </div>
     </div>

main/style/style.css

@@ -34,6 +34,14 @@ sup {
     background-color: white;
 }
 
+.alert {
+    width: 85%;
+    display: block;
+    margin-top: 40px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
 .project {
     margin-top: 50px;
 }
@@ -179,10 +187,6 @@ sup {
     margin-bottom: 10px;
 }
 
-.alert {
-    margin-top: 1rem;
-}
-
 #discord-widget {
     display: block;
     margin: auto;
@@ -238,7 +242,6 @@ pre.highlight {
     margin-top: 20px;
 }
 
-
 @media(max-width: 1199px) {
     .blog-title {
         margin-top: 15px;
@@ -255,7 +258,8 @@ pre.highlight {
     }
 
     .list-display,
-    .jumbotron {
+    .jumbotron,
+    .alert {
         width: auto;
         padding-left: 20px;
         padding-right: 20px;