From 8eea705e6f0b6945bb1cb63d68f1ccbe78321a5f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 27 Jul 2020 02:04:23 +0000 Subject: [PATCH 1/3] Update dependency browser-sync to ^2.26.12 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6e45a8d..7b1905c 100644 --- a/package.json +++ b/package.json @@ -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", -- 2.45.2 From c89867c3d9fcdd38616de788ad3bf27b540fc35e Mon Sep 17 00:00:00 2001 From: samuel-p Date: Mon, 27 Jul 2020 17:41:08 +0200 Subject: [PATCH 2/3] restructured project (closes #5) --- .eleventy.js | 8 +++--- package.json | 2 +- sites/de/404.md | 8 ------ sites/en/404.md | 8 ------ {sites => src}/_data/services.json | 0 {sites => src}/_data/site.js | 0 {sites => src}/_data/strings.json | 0 {sites => src}/_includes/layouts/base.njk | 0 {sites => src}/_includes/layouts/home.njk | 2 +- {sites => src}/_includes/layouts/services.njk | 0 {sites => src}/_includes/profiles.html | 2 +- .../_includes/services-extended.html | 0 {sites => src}/_includes/services-simple.html | 0 {sites => src}/de/de.json | 0 {sites => src}/de/imprint.html | 0 {sites => src}/de/index.html | 0 {sites => src}/de/privacy.html | 0 {sites => src}/de/services.html | 0 .../de/services/connectivitycheck.md | 0 {sites => src}/de/services/firefox-sync.md | 0 {sites => src}/de/services/gitea.md | 0 {sites => src}/de/services/invidious.md | 0 {sites => src}/de/services/matrix.md | 0 {sites => src}/de/services/searx.md | 0 {sites => src}/en/en.json | 0 {sites => src}/en/imprint.html | 0 {sites => src}/en/index.html | 0 {sites => src}/en/privacy.html | 0 {sites => src}/en/services.html | 0 .../en/services/connectivitycheck.md | 0 {sites => src}/en/services/firefox-sync.md | 0 {sites => src}/en/services/gitea.md | 0 {sites => src}/en/services/invidious.md | 0 {sites => src}/en/services/matrix.md | 0 {sites => src}/en/services/searx.md | 0 {img => src/img}/bg.png | Bin {img => src/img}/matrix.png | Bin {img => src/img}/samuel.png | Bin {img => src/img}/sp-codes.jpg | Bin {scss => src/scss}/main.scss | 24 +++++++++--------- 40 files changed, 19 insertions(+), 35 deletions(-) delete mode 100644 sites/de/404.md delete mode 100644 sites/en/404.md rename {sites => src}/_data/services.json (100%) rename {sites => src}/_data/site.js (100%) rename {sites => src}/_data/strings.json (100%) rename {sites => src}/_includes/layouts/base.njk (100%) rename {sites => src}/_includes/layouts/home.njk (70%) rename {sites => src}/_includes/layouts/services.njk (100%) rename {sites => src}/_includes/profiles.html (93%) rename {sites => src}/_includes/services-extended.html (100%) rename {sites => src}/_includes/services-simple.html (100%) rename {sites => src}/de/de.json (100%) rename {sites => src}/de/imprint.html (100%) rename {sites => src}/de/index.html (100%) rename {sites => src}/de/privacy.html (100%) rename {sites => src}/de/services.html (100%) rename {sites => src}/de/services/connectivitycheck.md (100%) rename {sites => src}/de/services/firefox-sync.md (100%) rename {sites => src}/de/services/gitea.md (100%) rename {sites => src}/de/services/invidious.md (100%) rename {sites => src}/de/services/matrix.md (100%) rename {sites => src}/de/services/searx.md (100%) rename {sites => src}/en/en.json (100%) rename {sites => src}/en/imprint.html (100%) rename {sites => src}/en/index.html (100%) rename {sites => src}/en/privacy.html (100%) rename {sites => src}/en/services.html (100%) rename {sites => src}/en/services/connectivitycheck.md (100%) rename {sites => src}/en/services/firefox-sync.md (100%) rename {sites => src}/en/services/gitea.md (100%) rename {sites => src}/en/services/invidious.md (100%) rename {sites => src}/en/services/matrix.md (100%) rename {sites => src}/en/services/searx.md (100%) rename {img => src/img}/bg.png (100%) rename {img => src/img}/matrix.png (100%) rename {img => src/img}/samuel.png (100%) rename {img => src/img}/sp-codes.jpg (100%) rename {scss => src/scss}/main.scss (79%) diff --git a/.eleventy.js b/.eleventy.js index f6a5ba6..9a02e4b 100644 --- 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" diff --git a/package.json b/package.json index 6e45a8d..d8a17a9 100644 --- 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:*", diff --git a/sites/de/404.md b/sites/de/404.md deleted file mode 100644 index 6c7444c..0000000 --- a/sites/de/404.md +++ /dev/null @@ -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}}/) diff --git a/sites/en/404.md b/sites/en/404.md deleted file mode 100644 index dafed38..0000000 --- a/sites/en/404.md +++ /dev/null @@ -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}}/) diff --git a/sites/_data/services.json b/src/_data/services.json similarity index 100% rename from sites/_data/services.json rename to src/_data/services.json diff --git a/sites/_data/site.js b/src/_data/site.js similarity index 100% rename from sites/_data/site.js rename to src/_data/site.js diff --git a/sites/_data/strings.json b/src/_data/strings.json similarity index 100% rename from sites/_data/strings.json rename to src/_data/strings.json diff --git a/sites/_includes/layouts/base.njk b/src/_includes/layouts/base.njk similarity index 100% rename from sites/_includes/layouts/base.njk rename to src/_includes/layouts/base.njk diff --git a/sites/_includes/layouts/home.njk b/src/_includes/layouts/home.njk similarity index 70% rename from sites/_includes/layouts/home.njk rename to src/_includes/layouts/home.njk index 0d2d5a8..246a92a 100644 --- a/sites/_includes/layouts/home.njk +++ b/src/_includes/layouts/home.njk @@ -3,7 +3,7 @@ layout: base.njk ---
- +
diff --git a/sites/_includes/layouts/services.njk b/src/_includes/layouts/services.njk similarity index 100% rename from sites/_includes/layouts/services.njk rename to src/_includes/layouts/services.njk diff --git a/sites/_includes/profiles.html b/src/_includes/profiles.html similarity index 93% rename from sites/_includes/profiles.html rename to src/_includes/profiles.html index 1d1da51..c7d9e9f 100644 --- a/sites/_includes/profiles.html +++ b/src/_includes/profiles.html @@ -2,7 +2,7 @@
-
+
Date: Tue, 28 Jul 2020 17:56:45 +0200 Subject: [PATCH 3/3] cleaned up main.scss (closes #4) --- src/_includes/layouts/base.njk | 4 +-- src/scss/main.scss | 62 +++++++++++++--------------------- 2 files changed, 25 insertions(+), 41 deletions(-) diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk index 90e0f64..26cad56 100644 --- a/src/_includes/layouts/base.njk +++ b/src/_includes/layouts/base.njk @@ -36,7 +36,7 @@ title: sp-codes -
+
{%- for entry in collections.all | eleventyNavigation %} {% if entry.url.includes(locale) %}
@@ -66,7 +66,7 @@ title: sp-codes {{ content | safe }}
-
+
Made with in Germany
Samuel Philipp
diff --git a/src/scss/main.scss b/src/scss/main.scss index 96a0e4e..7dadb3e 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -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; + } +} -- 2.45.2