From e96cbf25d28bb033bb4fe667aec6f592f1d32fb5 Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Sun, 16 Dec 2018 23:39:35 +0100
Subject: [PATCH] couple changes

---
 index.html          | 37 ++++++---------------------------
 scripts/about.js    | 14 ++++++-------
 scripts/greet.js    |  3 ++-
 scripts/main.js     | 12 +++++------
 scripts/projects.js | 50 ++++++---------------------------------------
 scripts/quote.js    |  4 +++-
 style.css           | 14 ++++++++++++-
 7 files changed, 42 insertions(+), 92 deletions(-)
diff --git a/index.html b/index.html
index ee150df..c50a8d0 100644
--- a/index.html
+++ b/index.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -7,7 +8,7 @@
     <title>Ellpeck.de</title>
     <meta name="author" content="Ellpeck">
     <meta name="description" content="Ellpeck's little internet place">
-    <meta name="keywords" content="Ellpeck, Actually Additions, Rock Bottom, Programming, Minecraft, Game Development">
+    <meta name="keywords" content="Ellpeck, Actually Additions, Rock Bottom, Programming, Minecraft, Game Development, Nature's Aura">
 
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto">
@@ -26,9 +27,10 @@
     <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"></script>
     <script src="scripts/main.js"></script>
 </head>
+
 <body data-spy="scroll" data-target="#navbar">
     <!-- Navbar -->
-    <nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light" id="navbar">
+    <nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light rounded-bottom" id="navbar">
         <!-- Navbar brand and logo -->
         <a class="navbar-brand mb-0 h1" href="#">
             <img src="res/logo.png" width="40" height="40" alt=""> Ellpeck.de
@@ -74,7 +76,7 @@
         <div class="list-display rounded">
             <h2>Projects</h2>
             <p>
-                Below is a list of some of the projects that I'm working on or that I've made in the past. Check them out if you want!<br> For a full list of my programming projects, you can check out my GitHub page linked below.
+                Here is a list of some of my main projects. Check them out if you want!<br> For a full list of my programming projects, you can check out my GitHub page linked <a href="#social">below</a>.
             </p>
             <div id="project-list">
                 <noscript><em>The content that should be here is dynamically generated. Please enable JavaScript if you see this.</em></noscript>
@@ -135,34 +137,6 @@
         </div>
     </div>
 
-    <!-- Book -->
-    <div class="modal fade" id="book-modal" tabindex="-1">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title">Where to buy <em>Glimmers in the Shadow</em></h5>
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                </div>
-                <div class="modal-body">
-                    There are a lot of different places where you can buy the book.
-                    <p>
-                        <br>On Lulu, I get a bigger profit than on the other sites, so if you want to support me financially, you should buy there:<br>
-                        <a class="btn btn-info rounded-0" href="http://www.lulu.com/shop/julian-schubert/glimmers-in-the-shadow/paperback/product-23679000.html">Lulu</a>
-                    </p>
-
-                    <p>
-                        If you want to buy the book conveniently, you can use a site from the list below that works best for you:<br>
-                        <a class="btn btn-info rounded-0" href="https://www.amazon.de/Glimmers-Shadow-Julian-Schubert/dp/0244393176/">Amazon.de</a>
-                        <a class="btn btn-info rounded-0" href="https://www.amazon.com/Glimmers-Shadow-Julian-Schubert/dp/0244393176/">Amazon.com</a>
-                        <a class="btn btn-info rounded-0" href="https://www.amazon.co.uk/Glimmers-Shadow-Julian-Schubert/dp/0244393176/">Amazon.co.uk</a>
-                        <a class="btn btn-info rounded-0" href="http://www.foyles.co.uk/witem/fiction-poetry/glimmers-in-the-shadow,julian-schubert-9780244393175">Foyles</a>
-                        <br><em>Note that some other sites and places might also be available to buy the book from.</em>
-                    </p>
-                </div>
-            </div>
-        </div>
-    </div>
-
     <!-- Impressum -->
     <div class="modal fade" id="impressum-modal" tabindex="-1">
         <div class="modal-dialog modal-lg">
@@ -240,4 +214,5 @@
         </div>
     </div>
 </body>
+
 </html>
\ No newline at end of file
diff --git a/scripts/about.js b/scripts/about.js
index 6f2281e..5dee729 100644
--- a/scripts/about.js
+++ b/scripts/about.js
@@ -12,11 +12,11 @@ const questions = [{
     },
     {
         'q': "What's your gender?",
-        'a': "I'm male."
+        'a': "I'm (cis) male."
     },
     {
         'q': "What's your sexual orientation?",
-        'a': 'I like cute guys.'
+        'a': 'I like <a href="https://twitter.com/Sarkasaa">cute guys</a>.'
     },
     {
         'q': 'What languages do you speak?',
@@ -24,7 +24,7 @@ const questions = [{
     },
     {
         'q': 'What\'s your favorite programming language?',
-        'a': 'Currently definitely C#. The first language I learned was Java, C# has a lot of nice features that I wish Java had like operator overloading and optional method parameters.'
+        'a': 'It varies between C# and Java, based on the language that I currently use more.'
     },
     {
         'q': "What's your job/occupation?",
@@ -36,19 +36,19 @@ const questions = [{
     },
     {
         'q': 'What do you use to code?',
-        'a': "For Java, I use IntelliJ IDEA. For C#, I use JetBrains Rider. For most of my other projects, which are usually rather small, I use Atom."
+        'a': "For Java, I use IntelliJ IDEA. For C#, I use JetBrains Rider. For most of my other projects, which are usually rather small, I use Visual Studio Code, which is awesome, by the way."
     },
     {
         'q': 'How did you make this site?',
         'a': 'I made this page using <a href="https://getbootstrap.com/">Bootstrap</a>. The content is dynamically generated using JavaScript based on a bunch of JSON data. If you\'re curious about the (probably pretty messy) code, then you can check out the <a href="https://github.com/Ellpeck/Web">GitHub repository</a>.'
     },
     {
-        'q': "What's your favorite ice cream?",
-        'a': 'Frozen yogurt.'
+        "q": "What's your favorite season?",
+        "a": "Whatever the current one isn't, honestly. Typical German."
     },
     {
         'q': 'Tabs or spaces?',
-        'a': (Math.random() >= 0.5 ? 'Tabs' : 'Spaces') + '.'
+        'a': "Spaces are the only true choice, because they don't have different sizes in different display locations."
     },
     {
         'q': 'What\'s the deal with life?',
diff --git a/scripts/greet.js b/scripts/greet.js
index 0a0942c..6de18ff 100644
--- a/scripts/greet.js
+++ b/scripts/greet.js
@@ -11,6 +11,7 @@ const greetings = [
     'Good day mate!',
     'Hello friend!',
     'Howdy!',
-    'Guten Tag!'
+    'Guten Tag!',
+    'Servus!'
 ];
 $('#intro-text').html(greetings[Math.floor(Math.random() * greetings.length)]);
\ No newline at end of file
diff --git a/scripts/main.js b/scripts/main.js
index c3e7db5..36538c5 100644
--- a/scripts/main.js
+++ b/scripts/main.js
@@ -1,23 +1,21 @@
-$(function() {
-    let openModals = function(hash) {
+$(function () {
+    let openModals = function (hash) {
         if (hash.length > 1) {
             if (hash === '#impressum') {
                 $('#impressum-modal').modal('show');
-            } else if (hash === '#glimmers') {
-                $('#book-modal').modal('show');
             }
         }
     }
     openModals(window.location.hash);
-    $('a').on('click', function() {
+    $('a').on('click', function () {
         openModals($(this).attr('href'));
     });
 
-    $('.navbar-collapse a').on('click', function() {
+    $('.navbar-collapse a').on('click', function () {
         $('.navbar-collapse').collapse('hide');
     });
 
-    $('#blobheart').on('click', function() {
+    $('#blobheart').on('click', function () {
         $('#navbar-image').attr('src', 'res/heart.png');
     });
 });
\ No newline at end of file
diff --git a/scripts/projects.js b/scripts/projects.js
index 3b2b042..7a42597 100644
--- a/scripts/projects.js
+++ b/scripts/projects.js
@@ -7,16 +7,6 @@ const projects = [{
         },
         'icon': 'na'
     },
-    {
-        'name': 'Rock Bottom',
-        'desc': 'Rock Bottom is a game I\'ve been working on for a little more than a year now. It\'s a 2D-sidescrolling sandbox game with a storyline that has multiplayer support, a modding API and a lot more fun stuff. It\'s currently still in early development.',
-        'links': {
-            'Website': 'https://rockbottom.ellpeck.de',
-            'API on GitHub': 'https://github.com/RockBottomGame/API'
-        },
-        'status': 'In development',
-        'icon': 'rb'
-    },
     {
         'name': 'Actually Additions',
         'desc': 'Actually Additions is a rather popular Minecraft mod that I used to work on. It\'s become widely known in the modding community and has reached over 10 million downloads by now, which is crazy. I don\'t work on it anymore myself, but it\'s being maintained for current versions by someone else.',
@@ -28,43 +18,15 @@ const projects = [{
         'icon': 'aa'
     },
     {
-        'name': 'Glimmers in the Shadow',
-        'desc': 'Glimmers in the Shadow is a book I\'ve been working on for a while. It contains stories and poems I wrote over the course of about two years. Here\'s the description from the cover:<br><em>It turns out that life as a human person isn\'t as easy as some people might lead you to believe. <br>During the last couple of years, my main way of dealing with negative feelings has been writing poems and stories as a way to understand my feelings or start thinking about something different." <br>This book is a collection of stories, poems, and personal anecdotes written by a teenager struggling with life. They go far beyond that, though: They\'re deep, weird, confusing, they\'re emotional. But together, they tell a story of a young person trying to understand the world.</em>',
+        'name': 'Rock Bottom',
+        'desc': 'Rock Bottom is a game I\'ve been working on for a little more than a year now. It\'s a 2D-sidescrolling sandbox game with a storyline that has multiplayer support, a modding API and a lot more fun stuff. It\'s currently still in early development, but I\'m kind of taking a break from it for a while.',
         'links': {
-            'Buy the Book': '#glimmers'
+            'Website': 'https://rockbottom.ellpeck.de',
+            'API on GitHub': 'https://github.com/RockBottomGame/API'
         },
-        'status': 'Published',
-        'icon': 'glimmers'
+        'status': 'On hold',
+        'icon': 'rb'
     },
-    {
-        'name': 'Tracer',
-        'desc': 'A small web app with spaceships that fly around and draw a line in a random color wherever they go. The cool thing is that, when two of them collide, both of their colors fade into a different one. It\'s fun to watch!',
-        'links': {
-            'Check it out': 'https://ellpeck.github.io/Tracer'
-        },
-        'status': 'Finished',
-        'icon': 'tracer'
-    },
-    {
-        'name': 'Sudoku',
-        'desc': 'A simple game of sudoku. Fill in the board with numbers one through nine, making sure each row, column and three by three field only ever has one of the same number. A board is randomly generated for you every time you refresh the page. Use the scroll wheel to input numbers into a selected field.',
-        'links': {
-            'Play it here': 'https://ellpeck.de/sudoku',
-            'Check the source': 'https://github.com/Ellpeck/Sudoku'
-        },
-        'status': 'Finished',
-        'icon': 'sudoku'
-    },
-    {
-        'name': 'Memory',
-        'desc': 'A game of memory. Turn over fields to see the numbers they have. Try to combine all of the same-numbered fields to uncover the board!',
-        'links': {
-            'Play it here': 'https://ellpeck.de/memory',
-            'Check the source': 'https://github.com/Ellpeck/Memory'
-        },
-        'status': 'Finished',
-        'icon': 'memory'
-    }
 ];
 
 let p = '';
diff --git a/scripts/quote.js b/scripts/quote.js
index 4ad606f..fff010c 100644
--- a/scripts/quote.js
+++ b/scripts/quote.js
@@ -11,6 +11,7 @@
     Poppy
     IAMX
     The Faint
+    Coldplay
 */
 
 const quotes = [
@@ -88,6 +89,7 @@ const quotes = [
     "Evil voices lie when they say you're alone",
     "I walk with the noise",
     "I need to surrender",
-    "Oh my god, you're beautiful"
+    "Oh my god, you're beautiful",
+    "The old king is dead, long live the king"
 ];
 $('#quote-text').html('<em>' + quotes[Math.floor(Math.random() * quotes.length)] + '</em>');
\ No newline at end of file
diff --git a/style.css b/style.css
index 50d0e4a..00cb9f6 100644
--- a/style.css
+++ b/style.css
@@ -11,7 +11,7 @@ body {
 }
 
 .list-display {
-    width: 80%;
+    width: 85%;
     display: block;
     margin-top: 40px;
     margin-left: auto;
@@ -118,10 +118,19 @@ body {
     margin-bottom: 10px;
 }
 
+@media (min-width: 1200px) {
+    .navbar {
+        width: 1200px;
+        margin-left: auto;
+        margin-right: auto;
+    }
+}
+
 @media (max-width: 768px) {
     .container {
         max-width: none;
     }
+
     .list-display {
         width: auto;
         padding-left: 20px;
@@ -136,17 +145,20 @@ body {
         text-indent: -99999px;
         margin: 5px;
     }
+
     .support-button {
         width: auto;
         overflow: hidden;
         text-indent: -99999px;
         margin: 5px;
     }
+
     .project-image {
         right: -18px;
         top: -18px;
         width: 50px;
     }
+
     .project-status {
         position: absolute;
         right: 10px;
