develop #70

Merged
samuel-p merged 7 commits from develop into main 2021-06-16 14:36:27 +00:00
13 changed files with 34 additions and 29 deletions
Showing only changes of commit 8c05d5d97b - Show all commits

View file

@ -7,7 +7,8 @@ module.exports = function (eleventyConfig) {
eleventyConfig.setUseGitIgnore(false); eleventyConfig.setUseGitIgnore(false);
eleventyConfig.addPassthroughCopy({ eleventyConfig.addPassthroughCopy({
"src/img": "img", "src/img": "img",
"src/font": "font" "src/font": "font",
"src/favicon.*": "",
}); });
eleventyConfig.addShortcode("translatedUrl", function (currentLocale, newLocale) { eleventyConfig.addShortcode("translatedUrl", function (currentLocale, newLocale) {
return this.page.url.replace(new RegExp(`\/${currentLocale}\/`), `/${newLocale}/`); return this.page.url.replace(new RegExp(`\/${currentLocale}\/`), `/${newLocale}/`);

View file

@ -3,11 +3,13 @@
"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 src/scss/ -o dist/css/", "compile-sass": "node-sass --output-style compressed --importer=node_modules/node-sass-tilde-importer src/scss/main.scss -o dist/css/",
"p-minify-css": "purifycss dist/css/main.css dist/**/*.html dist/**/**/*.html dist/**/**/**/*.html -i -m -o dist/css/main.css",
"minify-css": "uncss -n -H dist/ -o dist/css/main.css dist/**/*.html dist/**/**/*.html dist/**/**/**/*.html",
"watch:eleventy": "eleventy --serve", "watch:eleventy": "eleventy --serve",
"watch:sass": "npm run compile-sass -- --watch", "watch:sass": "npm-run-all compile-sass minify-css -- --watch",
"start": "npm-run-all compile-sass --parallel watch:*", "start": "npm-run-all compile-sass minify-css --parallel watch:*",
"build": "npm run compile-sass && eleventy && npm run move-index", "build": "npm run compile-sass && npm run strip-css && eleventy && npm run move-index && npm run minify-css",
"move-index": "cpx dist/de/index.html dist/" "move-index": "cpx dist/de/index.html dist/"
}, },
"author": "samuel-p", "author": "samuel-p",
@ -24,7 +26,8 @@
"cpx": "^1.5.0", "cpx": "^1.5.0",
"node-sass": "^6.0.0", "node-sass": "^6.0.0",
"node-sass-tilde-importer": "^1.0.2", "node-sass-tilde-importer": "^1.0.2",
"npm-run-all": "^4.1.5" "npm-run-all": "^4.1.5",
"uncss": "^0.17.3"
}, },
"dependencies": { "dependencies": {
"bootstrap": "^4.6.0" "bootstrap": "^4.6.0"

View file

@ -88,7 +88,7 @@
}, },
{ {
"id": "translate", "id": "translate",
"name": "LibreTranslate", "name": "Translate",
"icon": "i-language", "icon": "i-language",
"url": "https://translate.sp-codes.de", "url": "https://translate.sp-codes.de",
"status": "https://translate.sp-codes.de", "status": "https://translate.sp-codes.de",

View file

@ -31,8 +31,8 @@ title: sp-codes
<meta name="twitter:title" content="sp-codes"> <meta name="twitter:title" content="sp-codes">
<meta name="twitter:description" content="Samuel Philipp - Software Engineer from Magdeburg"> <meta name="twitter:description" content="Samuel Philipp - Software Engineer from Magdeburg">
<meta name="twitter:image" content="https://sp-codes.de/img/sp-codes.jpg"> <meta name="twitter:image" content="https://sp-codes.de/img/sp-codes.jpg">
<link rel="shortcut icon" href="img/sp-codes.ico"> <link rel="shortcut icon" href="favicon.ico">
<link rel="stylesheet" href="/css/logo.css"> <link rel="icon" type="image/png" href="favicon.png">
<link rel="stylesheet" href="/css/main.css"> <link rel="stylesheet" href="/css/main.css">
<script async defer data-domain="sp-codes.de" src="https://plausible.sp-codes.de/js/plausible.outbound-links.js"></script> <script async defer data-domain="sp-codes.de" src="https://plausible.sp-codes.de/js/plausible.outbound-links.js"></script>
</head> </head>

View file

@ -1,27 +1,27 @@
<div class="d-flex justify-content-center flex-wrap my-3 contact-links"> <div class="d-flex justify-content-center flex-wrap my-3 contact-links">
<div class="m-2"><a href="mailto:mail@sp-codes.de"> <div class="m-2"><a href="mailto:mail@sp-codes.de">
<span class="d-none d-md-inline-block i-envelope i-4x"></span> <span class="d-none d-md-inline-block i-envelope i-4x i-fw"></span>
<span class="d-inline-block d-md-none i-envelope i-2x"></span> <span class="d-inline-block d-md-none i-envelope i-2x i-fw"></span>
</a></div> </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">
<span class="d-none d-md-inline-block i-matrix i-4x"></span> <span class="d-none d-md-inline-block i-matrix i-4x i-fw"></span>
<span class="d-inline-block d-md-none i-matrix i-2x"></span> <span class="d-inline-block d-md-none i-matrix i-2x i-fw"></span>
</a></div> </a></div>
<div class="m-2"><a rel="me" href="https://social.sp-codes.de/@samuel_p"> <div class="m-2"><a rel="me" href="https://social.sp-codes.de/@samuel_p">
<span class="d-none d-md-inline-block i-mastodon i-4x"></span> <span class="d-none d-md-inline-block i-mastodon i-4x i-fw"></span>
<span class="d-inline-block d-md-none i-mastodon i-2x"></span> <span class="d-inline-block d-md-none i-mastodon i-2x i-fw"></span>
</a></div> </a></div>
<div class="m-2"><a href="https://stackoverflow.com/users/9662601/samuel-p"> <div class="m-2"><a href="https://stackoverflow.com/users/9662601/samuel-p">
<span class="d-none d-md-inline-block i-stackoverflow i-4x"></span> <span class="d-none d-md-inline-block i-stackoverflow i-4x i-fw"></span>
<span class="d-inline-block d-md-none i-stackoverflow i-2x"></span> <span class="d-inline-block d-md-none i-stackoverflow i-2x i-fw"></span>
</a></div> </a></div>
<div class="m-2"><a href="https://git.sp-codes.de/samuel-p"> <div class="m-2"><a href="https://git.sp-codes.de/samuel-p">
<span class="d-none d-md-inline-block i-gitea i-4x"></span> <span class="d-none d-md-inline-block i-gitea i-4x i-fw"></span>
<span class="d-inline-block d-md-none i-gitea i-2x"></span> <span class="d-inline-block d-md-none i-gitea i-2x i-fw"></span>
</a></div> </a></div>
<div class="m-2"><a href="https://github.com/samuel-p"> <div class="m-2"><a href="https://github.com/samuel-p">
<span class="d-none d-md-inline-block i-github i-4x"></span> <span class="d-none d-md-inline-block i-github i-4x i-fw"></span>
<span class="d-inline-block d-md-none i-github i-2x"></span> <span class="d-inline-block d-md-none i-github i-2x i-fw"></span>
</a></div> </a></div>
</div> </div>
<div class="d-flex justify-content-center mb-3"> <div class="d-flex justify-content-center mb-3">

View file

@ -6,7 +6,7 @@
<div class="beta">TEST-PHASE</div> <div class="beta">TEST-PHASE</div>
{% endif %} {% endif %}
<div class="inner"> <div class="inner">
<i class="{{service.icon}} i-4x"></i> <i class="{{service.icon}} i-4x i-fw"></i>
<h2 class="mt-2 mb-1">{{service.name}}{% if service.url %} <a href="{{service.url}}" target="_blank"><i <h2 class="mt-2 mb-1">{{service.name}}{% if service.url %} <a href="{{service.url}}" target="_blank"><i
class="i-external-link"></i></a>{% endif %}</h2> class="i-external-link"></i></a>{% endif %}</h2>
{% if service.status %} {% if service.status %}

View file

@ -6,7 +6,7 @@
{% if service.beta == true %} {% if service.beta == true %}
<div class="beta">TEST-PHASE</div> <div class="beta">TEST-PHASE</div>
{% endif %} {% endif %}
<i class="{{service.icon}} i-2x"></i> <i class="{{service.icon}} i-2x i-fw"></i>
<h2 class="mt-2">{{service.name}}{% if service.url %} <a href="{{service.url}}" target="_blank"><i <h2 class="mt-2">{{service.name}}{% if service.url %} <a href="{{service.url}}" target="_blank"><i
class="i-external-link"></i></a>{% endif %}</h2> class="i-external-link"></i></a>{% endif %}</h2>
</div> </div>

BIN
src/favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/favicon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/img/bg.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

View file

@ -1,3 +1,9 @@
@import "logo";
$icomoon-font-path: "../font";
@import "icons/style";
$flag-icon-path: '../img';
@import "icons/flags";
@import "node_modules/bootstrap/scss/bootstrap-grid"; @import "node_modules/bootstrap/scss/bootstrap-grid";
@import "node_modules/bootstrap/scss/bootstrap-reboot"; @import "node_modules/bootstrap/scss/bootstrap-reboot";
@import "node_modules/bootstrap/scss/utilities/align"; @import "node_modules/bootstrap/scss/utilities/align";
@ -9,11 +15,6 @@
@import "node_modules/bootstrap/scss/variables"; @import "node_modules/bootstrap/scss/variables";
@import "node_modules/bootstrap/scss/mixins/_breakpoints"; @import "node_modules/bootstrap/scss/mixins/_breakpoints";
$icomoon-font-path: "../font";
@import "icons/style";
$flag-icon-path: '../img';
@import "icons/flags";
$primary: #fea500; $primary: #fea500;
$primary_dark: #e5a52e; $primary_dark: #e5a52e;
@ -24,7 +25,7 @@ html, body {
} }
body { body {
background-image: url("../img/bg.png"); background-image: url("../img/bg.jpg");
color: #fff; color: #fff;
font-weight: 300; font-weight: 300;
min-height: 100vh; min-height: 100vh;