develop #21

Manually merged
samuel-p merged 6 commits from develop into master 2020-07-29 20:25:12 +00:00
40 changed files with 19 additions and 35 deletions
Showing only changes of commit c89867c3d9 - Show all commits

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:*",

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

@ -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%;