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

Reviewed-on: samuel-p/sp-codes.de#21
This commit is contained in:
Samuel Philipp 2020-07-29 20:25:04 +00:00
commit cf6352f138
40 changed files with 45 additions and 77 deletions

View file

@ -1,20 +1,20 @@
const eleventyNavigationPlugin = require("@11ty/eleventy-navigation"); const eleventyNavigationPlugin = require("@11ty/eleventy-navigation");
module.exports = function(eleventyConfig) { module.exports = function(eleventyConfig) {
eleventyConfig.addWatchTarget("./scss/"); eleventyConfig.addWatchTarget("./src/scss/");
eleventyConfig.addPlugin(eleventyNavigationPlugin); eleventyConfig.addPlugin(eleventyNavigationPlugin);
eleventyConfig.setUseGitIgnore(false); eleventyConfig.setUseGitIgnore(false);
eleventyConfig.addPassthroughCopy({ eleventyConfig.addPassthroughCopy({
"img": "img", "src/img": "img",
"font": "font", "src/font": "font",
"node_modules/@fortawesome/fontawesome-free/webfonts/": "font", "node_modules/@fortawesome/fontawesome-free/webfonts/": "font",
"node_modules/flag-icon-css/flags/4x3/(de|us)*": "flags" "node_modules/flag-icon-css/flags/4x3/(de|us)*": "flags"
}); });
return { return {
dir: { dir: {
input: "sites", input: "src",
includes: "_includes", includes: "_includes",
layouts: "_includes/layouts", layouts: "_includes/layouts",
output: "dist" output: "dist"

View file

@ -3,7 +3,7 @@
"version": "1.0.0", "version": "1.0.0",
"description": "website for sp-codes.de", "description": "website for sp-codes.de",
"scripts": { "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:eleventy": "eleventy --serve",
"watch:sass": "npm run compile-sass -- --watch", "watch:sass": "npm run compile-sass -- --watch",
"start": "npm-run-all compile-sass --parallel watch:*", "start": "npm-run-all compile-sass --parallel watch:*",
@ -16,7 +16,7 @@
"url": "https://git.sp-codes.de/samuel-p/sp-codes.de" "url": "https://git.sp-codes.de/samuel-p/sp-codes.de"
}, },
"optionalDependencies": { "optionalDependencies": {
"browser-sync": "^2.26.10" "browser-sync": "^2.26.12"
}, },
"devDependencies": { "devDependencies": {
"@11ty/eleventy": "^0.11.0", "@11ty/eleventy": "^0.11.0",

View file

@ -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}}/)

View file

@ -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}}/)

View file

@ -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> <script async defer data-domain="sp-codes.de" src="https://plausible.sp-codes.de/js/plausible.js"></script>
</head> </head>
<body> <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 %} {%- for entry in collections.all | eleventyNavigation %}
{% if entry.url.includes(locale) %} {% if entry.url.includes(locale) %}
<div {% if entry.url == page.url %} class="active"{% endif %}> <div {% if entry.url == page.url %} class="active"{% endif %}>
@ -66,7 +66,7 @@ title: sp-codes
{{ content | safe }} {{ content | safe }}
</div> </div>
</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="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">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> <div class="mr-3"><span class="far fa-copyright mr-2"></span>Samuel Philipp</div>

View file

@ -3,7 +3,7 @@ layout: base.njk
--- ---
<div class="row py-5"> <div class="row py-5">
<div class="col"> <div class="col">
<img class="logo" src="/img/samuel.png"> <img class="logo" src="img/samuel.png">
</div> </div>
</div> </div>

View file

@ -2,7 +2,7 @@
<div class="m-2"><a href="mailto:mail@sp-codes.de"><span <div class="m-2"><a href="mailto:mail@sp-codes.de"><span
class="fas fa-fw fa-4x fa-envelope"></span></a></div> 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"> <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 <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> 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 <div class="m-2"><a href="https://stackoverflow.com/users/9662601/samuel-p"><span

View file

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View file

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View file

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 84 KiB

View file

Before

Width:  |  Height:  |  Size: 179 KiB

After

Width:  |  Height:  |  Size: 179 KiB

View file

@ -1,18 +1,18 @@
@import "~bootstrap/scss/bootstrap-grid"; @import "node_modules/bootstrap/scss/bootstrap-grid";
@import "~bootstrap/scss/bootstrap-reboot"; @import "node_modules/bootstrap/scss/bootstrap-reboot";
@import "~bootstrap/scss/utilities/align"; @import "node_modules/bootstrap/scss/utilities/align";
@import "~bootstrap/scss/utilities/spacing"; @import "node_modules/bootstrap/scss/utilities/spacing";
@import "~bootstrap/scss/utilities/display"; @import "node_modules/bootstrap/scss/utilities/display";
@import "~bootstrap/scss/utilities/text"; @import "node_modules/bootstrap/scss/utilities/text";
@import "~bootstrap/scss/utilities/float"; @import "node_modules/bootstrap/scss/utilities/float";
$fa-font-path: "../font"; $fa-font-path: "../font";
@import "~@fortawesome/fontawesome-free/scss/fontawesome"; @import "node_modules/@fortawesome/fontawesome-free/scss/fontawesome";
@import "~@fortawesome/fontawesome-free/scss/solid"; @import "node_modules/@fortawesome/fontawesome-free/scss/solid";
@import "~@fortawesome/fontawesome-free/scss/brands"; @import "node_modules/@fortawesome/fontawesome-free/scss/brands";
@import "~@fortawesome/fontawesome-free/scss/regular"; @import "node_modules/@fortawesome/fontawesome-free/scss/regular";
$flag-icon-rect-path: ''; $flag-icon-rect-path: '';
@import "~flag-icon-css/sass/flag-icon"; @import "node_modules/flag-icon-css/sass/flag-icon";
html, body { html, body {
height: 100%; 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 {
border-top: 1px solid #ffffff; border-top: 1px solid #ffffff;
} }
@ -97,19 +84,6 @@ a {
flex: 1; 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 { .service {
background-color: #222; background-color: #222;
border: 1px solid #fff; border: 1px solid #fff;
@ -179,19 +153,6 @@ a {
color: #ffffff !important; color: #ffffff !important;
} }
.matrix-icon {
margin: 0 8px;
width: 4em;
height: 4em;
}
@media (max-width: 767.98px) {
.matrix-icon {
width: 2em;
height: 2em;
}
}
code { code {
background-color: #fea500; background-color: #fea500;
color: #000000; color: #000000;
@ -211,3 +172,26 @@ pre {
border-radius: initial; 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;
}
}