Merge pull request 'develop' (#30) from develop into master

Reviewed-on: https://git.sp-codes.de/samuel-p/sp-codes.de/pulls/30

package.json

@@ -27,7 +27,7 @@
     "npm-run-all": "^4.1.5"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.14.0",
+    "@fortawesome/fontawesome-free": "^5.15.0",
     "bootstrap": "^4.5.2",
     "flag-icon-css": "^3.5.0"
   }

src/_includes/services-simple.html

@@ -1,13 +1,15 @@
 {%- for service in services %}
 <div class="col-12 col-md-6 p-3">
     <div class="service flat">
-        <a class="link inner" href="/{{locale}}/services{% if service.beta != true %}/{{service.id}}{% endif %}">
+        <a class="link" href="/{{locale}}/services{% if service.beta != true %}/{{service.id}}{% endif %}"></a>
+        <div class="inner" href="/{{locale}}/services{% if service.beta != true %}/{{service.id}}{% endif %}">
             {% if service.beta == true %}
             <div class="beta">TEST-PHASE</div>
             {% endif %}
             <i class="{{service.icon}} fa-fw fa-2x"></i>
-            <h2 class="mt-2">{{service.name}}</h2>
-        </a>
+            <h2 class="mt-2">{{service.name}}{% if service.url %} <a href="{{service.url}}" target="_blank"><i
+                    class="fas fa-external-link-alt"></i></a>{% endif %}</h2>
+        </div>
     </div>
 </div>
 {%- endfor %}

src/de/services/matrix.md

@@ -13,6 +13,8 @@ __Seit Anfang 2020 betreibe ich einen öffentlichen Matrix-Server: [matrix.sp-co
 
 Melde dich gerne auf meinem Server an oder suche dir einen aus der unten verlinkten Liste heraus. Ich freue mich auf deine Nachricht an [@samuel-p:matrix.sp-codes.de](https://matrix.to/#/@samuel-p:matrix.sp-codes.de).
 
+Auf meinem Blog findest du einen einfachen Einstieg in das Matrix-Netzwerk: [Werde Teil der Matrix](https://blog.sp-codes.de/werde-teil-der-matrix-matrix-teil-1/)
+
 ## Weitere nützliche Links
 
 * [Verschiedene Apps](https://matrix.org/clients)

src/de/services/searx.md

@@ -17,6 +17,8 @@ __Hier gehts zu Searx: [searx.sp-codes.de](https://searx.sp-codes.de)__
 
 Tor Hidden Service: [searxbi3f73mmdeb.onion](http://searxbi3f73mmdeb.onion)
 
+Wenn du Searx als Standardsuchmaschine nutzen willst, findest du auf meinem Blog eine Anleitung dafür: [Nur noch Searx](https://blog.sp-codes.de/nur-noch-searx/)
+
 ## Weitere nützliche Links
 
 * [Searx Webseite](https://asciimoo.github.io/searx/)

src/en/index.html

@@ -13,7 +13,7 @@ eleventyNavigation:
         <p class="lead text-center mb-2">
             Glad you found your way here. My name is Samuel Philipp and I am a software engineer from Magdeburg.
             On this site you will find information about me and an overview of the services I provide. Feel free
-            to look around, read my <a href="https://blog.sp-codes.de">Blog</a> (in German) or use the various services.
+            to look around, read my <a href="https://blog.sp-codes.de">blog</a> (German) or use the various services.
         </p>
     </div>
 </div>

src/en/services/matrix.md

@@ -13,6 +13,8 @@ __Since the beginning of 2020 I run a public Matrix server: [matrix.sp-codes.de]
 
 Feel free to create an account on my server or choose one from the list linked below. I look forward to hear from you [@samuel-p:matrix.sp-codes.de](https://matrix.to/#/@samuel-p:matrix.sp-codes.de).
 
+On my blog (German) you will find a simple introduction to the Matrix network: [Werde Teil der Matrix](https://blog.sp-codes.de/werde-teil-der-matrix-matrix-teil-1/)
+
 ## More useful links
 
 * [Various Apps](https://matrix.org/clients)

src/en/services/searx.md

@@ -17,6 +17,8 @@ Here is the link to Searx: [searx.sp-codes.de](https://searx.sp-codes.de)
 
 Tor Hidden Service: [searxbi3f73mmdeb.onion](http://searxbi3f73mmdeb.onion)
 
+If you want to use Searx as your default search engine, you can find instructions on my blog (German): [Nur noch Searx](https://blog.sp-codes.de/nur-noch-searx/)
+
 ## More useful links
 
 * [Searx Website](https://asciimoo.github.io/searx/)

src/scss/main.scss

@@ -49,14 +49,14 @@ a {
   margin: 0 auto;
   max-width: 256px;
   max-height: 256px;
-  background-color: #ffffff;
+  background-color: #fff;
   border-radius: 50%;
-  border: 2px solid #000000;
+  border: 2px solid #000;
 }
 
 .menu {
   a {
-    color: #ffffff;
+    color: #fff;
   }
 
   .active a {
@@ -65,18 +65,18 @@ a {
 }
 
 .border-top {
-  border-top: 1px solid #ffffff;
+  border-top: 1px solid #fff;
 }
 
 .border-bottom {
-  border-bottom: 1px solid #ffffff;
+  border-bottom: 1px solid #fff;
 }
 
 .heading {
   text-align: center;
 
   a {
-    color: #ffffff;
+    color: #fff;
   }
 }
 
@@ -85,6 +85,7 @@ a {
 }
 
 .service {
+  position: relative;
   background-color: #222;
   border: 1px solid #fff;
   height: 100%;
@@ -132,9 +133,15 @@ a {
   }
 
   &.flat {
+    color: #fea500 !important;
+
+    &:hover {
+      color: #d78c00 !important;
+    }
+
     .inner {
       flex-direction: row;
-      pointer-events: all;
+      //pointer-events: all;
       text-decoration: none;
 
       h2 {
@@ -145,6 +152,10 @@ a {
         top: 0;
         right: -1rem;
       }
+
+      a {
+        color: #fff;
+      }
     }
   }
 }