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

Reviewed-on: #21
Merge branch 'master' into develop
2020-07-29 20:25:04 +00:00 · 2020-07-29 16:55:48 +00:00 · 2020-07-28 17:56:45 +02:00 · 2020-07-27 17:41:16 +02:00 · 2020-07-27 17:41:08 +02:00 · 2020-07-27 15:26:40 +00:00
40 changed files with 45 additions and 77 deletions
--- a/.eleventy.js
+++ b/.eleventy.js
@ -1,20 +1,20 @@
 const eleventyNavigationPlugin = require("@11ty/eleventy-navigation");

 module.exports = function(eleventyConfig) {
-    eleventyConfig.addWatchTarget("./scss/");
+    eleventyConfig.addWatchTarget("./src/scss/");

    eleventyConfig.addPlugin(eleventyNavigationPlugin);
    eleventyConfig.setUseGitIgnore(false);
    eleventyConfig.addPassthroughCopy({
-        "img": "img",
-        "font": "font",
+        "src/img": "img",
+        "src/font": "font",
        "node_modules/@fortawesome/fontawesome-free/webfonts/": "font",
        "node_modules/flag-icon-css/flags/4x3/(de|us)*": "flags"
    });

    return {
        dir: {
-            input: "sites",
+            input: "src",
            includes: "_includes",
            layouts: "_includes/layouts",
            output: "dist"
--- a/package.json
+++ b/package.json
@ -3,7 +3,7 @@
  "version": "1.0.0",
  "description": "website for sp-codes.de",
  "scripts": {
-    "compile-sass": "node-sass --output-style compressed --importer=node_modules/node-sass-tilde-importer scss/main.scss dist/css/main.css",
+    "compile-sass": "node-sass --output-style compressed --importer=node_modules/node-sass-tilde-importer src/scss/main.scss dist/css/main.css",
    "watch:eleventy": "eleventy --serve",
    "watch:sass": "npm run compile-sass -- --watch",
    "start": "npm-run-all compile-sass --parallel watch:*",
@ -16,7 +16,7 @@
    "url": "https://git.sp-codes.de/samuel-p/sp-codes.de"
  },
  "optionalDependencies": {
-    "browser-sync": "^2.26.10"
+    "browser-sync": "^2.26.12"
  },
  "devDependencies": {
    "@11ty/eleventy": "^0.11.0",
--- a/sites/de/404.md
+++ b/sites/de/404.md
@ -1,8 +0,0 @@
---
-layout: base.njk
-key: 404
-title: Nicht gefunden
---
-# Nicht gefunden
-
-Diese Seite existiert (noch) nicht. Schau später nochmal vorbei, oder fang von vorne an: [Home](/{{locale}}/)
--- a/sites/en/404.md
+++ b/sites/en/404.md
@ -1,8 +0,0 @@
---
-layout: base.njk
-key: 404
-title: Not Found
---
-# Not Found
-
-This page does not exist (yet). Come back later or take a look at the beginning: [Home](/{{locale}}/)
--- a/sites/_data/services.json
+++ b/sites/_data/services.json
--- a/sites/_data/site.js
+++ b/sites/_data/site.js
--- a/sites/_data/strings.json
+++ b/sites/_data/strings.json
--- a/sites/_includes/layouts/base.njk
+++ b/sites/_includes/layouts/base.njk
@ -36,7 +36,7 @@ title: sp-codes
    <script async defer data-domain="sp-codes.de" src="https://plausible.sp-codes.de/js/plausible.js"></script>
 </head>
  <body>
-    <div class="d-flex justify-content-start flex-wrap p-2 menu menu-top">
+    <div class="d-flex justify-content-start flex-wrap p-2 menu border-bottom">
    {%- for entry in collections.all | eleventyNavigation %}
      {% if entry.url.includes(locale) %}
        <div {% if entry.url == page.url %} class="active"{% endif %}>
@ -66,7 +66,7 @@ title: sp-codes
        {{ content | safe }}
      </div>
    </div>
-    <div class="d-flex justify-content-start flex-wrap p-2 menu menu-bottom">
+    <div class="d-flex justify-content-start flex-wrap p-2 menu border-top">
        <div class="d-flex justify-content-start flex-wrap">
            <div class="mr-3">Made with <span class="fas fa-heart highlight"></span> in Germany</div>
            <div class="mr-3"><span class="far fa-copyright mr-2"></span>Samuel Philipp</div>
--- a/sites/_includes/layouts/home.njk
+++ b/sites/_includes/layouts/home.njk
@ -3,7 +3,7 @@ layout: base.njk
 ---
 <div class="row py-5">
  <div class="col">
-    <img class="logo" src="/img/samuel.png">
+    <img class="logo" src="img/samuel.png">
  </div>
 </div>

--- a/sites/_includes/layouts/services.njk
+++ b/sites/_includes/layouts/services.njk
--- a/sites/_includes/profiles.html
+++ b/sites/_includes/profiles.html
@ -2,7 +2,7 @@
    <div class="m-2"><a href="mailto:mail@sp-codes.de"><span
            class="fas fa-fw fa-4x fa-envelope"></span></a></div>
    <div class="m-2"><a href="https://matrix.to/#/@samuel-p:matrix.sp-codes.de">
-        <img class="matrix-icon" src="img/matrix.png" alt=""></a></div>
+        <img class="matrix-icon" src="../img/matrix.png" alt=""></a></div>
    <div class="m-2"><a rel="me" href="https://social.tchncs.de/@samuel_p"><span
            class="fab fa-fw fa-4x fa-mastodon"></span></a></div>
    <div class="m-2"><a href="https://stackoverflow.com/users/9662601/samuel-p"><span
--- a/sites/_includes/services-extended.html
+++ b/sites/_includes/services-extended.html
--- a/sites/_includes/services-simple.html
+++ b/sites/_includes/services-simple.html
--- a/sites/de/de.json
+++ b/sites/de/de.json
--- a/sites/de/imprint.html
+++ b/sites/de/imprint.html
--- a/sites/de/index.html
+++ b/sites/de/index.html
--- a/sites/de/privacy.html
+++ b/sites/de/privacy.html
--- a/sites/de/services.html
+++ b/sites/de/services.html
--- a/sites/de/services/connectivitycheck.md
+++ b/sites/de/services/connectivitycheck.md
--- a/sites/de/services/firefox-sync.md
+++ b/sites/de/services/firefox-sync.md
--- a/sites/de/services/gitea.md
+++ b/sites/de/services/gitea.md
--- a/sites/de/services/invidious.md
+++ b/sites/de/services/invidious.md
--- a/sites/de/services/matrix.md
+++ b/sites/de/services/matrix.md
--- a/sites/de/services/searx.md
+++ b/sites/de/services/searx.md
--- a/sites/en/en.json
+++ b/sites/en/en.json
--- a/sites/en/imprint.html
+++ b/sites/en/imprint.html
--- a/sites/en/index.html
+++ b/sites/en/index.html
--- a/sites/en/privacy.html
+++ b/sites/en/privacy.html
--- a/sites/en/services.html
+++ b/sites/en/services.html
--- a/sites/en/services/connectivitycheck.md
+++ b/sites/en/services/connectivitycheck.md
--- a/sites/en/services/firefox-sync.md
+++ b/sites/en/services/firefox-sync.md
--- a/sites/en/services/gitea.md
+++ b/sites/en/services/gitea.md
--- a/sites/en/services/invidious.md
+++ b/sites/en/services/invidious.md
--- a/sites/en/services/matrix.md
+++ b/sites/en/services/matrix.md
--- a/sites/en/services/searx.md
+++ b/sites/en/services/searx.md
--- a/src/img/bg.png
+++ b/src/img/bg.png
--- a/src/img/matrix.png
+++ b/src/img/matrix.png
--- a/src/img/samuel.png
+++ b/src/img/samuel.png
--- a/src/img/sp-codes.jpg
+++ b/src/img/sp-codes.jpg
--- a/src/scss/main.scss
+++ b/src/scss/main.scss
@ -1,18 +1,18 @@
-@import "~bootstrap/scss/bootstrap-grid";
-@import "~bootstrap/scss/bootstrap-reboot";
-@import "~bootstrap/scss/utilities/align";
-@import "~bootstrap/scss/utilities/spacing";
-@import "~bootstrap/scss/utilities/display";
-@import "~bootstrap/scss/utilities/text";
-@import "~bootstrap/scss/utilities/float";
+@import "node_modules/bootstrap/scss/bootstrap-grid";
+@import "node_modules/bootstrap/scss/bootstrap-reboot";
+@import "node_modules/bootstrap/scss/utilities/align";
+@import "node_modules/bootstrap/scss/utilities/spacing";
+@import "node_modules/bootstrap/scss/utilities/display";
+@import "node_modules/bootstrap/scss/utilities/text";
+@import "node_modules/bootstrap/scss/utilities/float";

 $fa-font-path: "../font";
-@import "~@fortawesome/fontawesome-free/scss/fontawesome";
-@import "~@fortawesome/fontawesome-free/scss/solid";
-@import "~@fortawesome/fontawesome-free/scss/brands";
-@import "~@fortawesome/fontawesome-free/scss/regular";
+@import "node_modules/@fortawesome/fontawesome-free/scss/fontawesome";
+@import "node_modules/@fortawesome/fontawesome-free/scss/solid";
+@import "node_modules/@fortawesome/fontawesome-free/scss/brands";
+@import "node_modules/@fortawesome/fontawesome-free/scss/regular";
 $flag-icon-rect-path: '';
-@import "~flag-icon-css/sass/flag-icon";
+@import "node_modules/flag-icon-css/sass/flag-icon";

 html, body {
  height: 100%;
@ -64,19 +64,6 @@ a {
  }
 }

-.menu-top {
-  border-bottom: 1px solid #ffffff;
-}
-
-.menu-bottom {
-  border-top: 1px solid #ffffff;
-}
-
-.border-top-bottom {
-  border-top: 1px solid #ffffff;
-  border-bottom: 1px solid #ffffff;
-}
-
 .border-top {
  border-top: 1px solid #ffffff;
 }
@ -97,19 +84,6 @@ a {
  flex: 1;
 }

-@media (max-width: 767.98px) {
-  .sp-codes {
-    font-size: 3rem;
-  }
-  .logo {
-    max-width: 128px;
-    max-height: 128px;
-  }
-  .fa-4x {
-    font-size: 2em;
-  }
-}
-
 .service {
  background-color: #222;
  border: 1px solid #fff;
@ -179,19 +153,6 @@ a {
  color: #ffffff !important;
 }

-.matrix-icon {
-  margin: 0 8px;
-  width: 4em;
-  height: 4em;
-}
-
-@media (max-width: 767.98px) {
-  .matrix-icon {
-    width: 2em;
-    height: 2em;
-  }
-}
-
 code {
  background-color: #fea500;
  color: #000000;
@ -211,3 +172,26 @@ pre {
    border-radius: initial;
  }
 }
+
+@media (max-width: 767.98px) {
+  .logo {
+    max-width: 128px;
+    max-height: 128px;
+  }
+  .fa-4x {
+    font-size: 2em;
+  }
+}
+
+.matrix-icon {
+  margin: 0 8px;
+  width: 4em;
+  height: 4em;
+}
+
+@media (max-width: 767.98px) {
+  .matrix-icon {
+    width: 2em;
+    height: 2em;
+  }
+}
Author	SHA1	Message	Date
Samuel Philipp	cf6352f138	Merge pull request 'develop' (#21 ) from develop into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #21	2020-07-29 20:25:04 +00:00
Samuel Philipp	ea194608b6	Merge branch 'master' into develop All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details	2020-07-29 16:55:48 +00:00
samuel-p	4c80feec17	cleaned up main.scss (closes #4 ) All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2020-07-28 17:56:45 +02:00
samuel-p	838b7c1ae8	Merge remote-tracking branch 'origin/develop' into develop All checks were successful continuous-integration/drone/push Build is passing Details	2020-07-27 17:41:16 +02:00
samuel-p	c89867c3d9	restructured project (closes #5 )	2020-07-27 17:41:08 +02:00
Samuel Philipp	6056a90c41	Merge pull request 'Update dependency browser-sync to ^2.26.12' (#20 ) from renovate/browser-sync-2.x into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #20	2020-07-27 15:26:40 +00:00
Renovate Bot	8eea705e6f	Update dependency browser-sync to ^2.26.12 All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2020-07-27 02:04:23 +00:00