diff --git a/.eleventy.js b/.eleventy.js index 577f27c..2cd5a68 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -7,7 +7,8 @@ module.exports = function (eleventyConfig) { eleventyConfig.setUseGitIgnore(false); eleventyConfig.addPassthroughCopy({ "src/img": "img", - "src/font": "font" + "src/font": "font", + "src/favicon.*": "", }); eleventyConfig.addShortcode("translatedUrl", function (currentLocale, newLocale) { return this.page.url.replace(new RegExp(`\/${currentLocale}\/`), `/${newLocale}/`); diff --git a/package.json b/package.json index f587a95..aeeb481 100644 --- a/package.json +++ b/package.json @@ -3,11 +3,13 @@ "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 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:sass": "npm run compile-sass -- --watch", - "start": "npm-run-all compile-sass --parallel watch:*", - "build": "npm run compile-sass && eleventy && npm run move-index", + "watch:sass": "npm-run-all compile-sass minify-css -- --watch", + "start": "npm-run-all compile-sass minify-css --parallel watch:*", + "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/" }, "author": "samuel-p", @@ -24,7 +26,8 @@ "cpx": "^1.5.0", "node-sass": "^6.0.0", "node-sass-tilde-importer": "^1.0.2", - "npm-run-all": "^4.1.5" + "npm-run-all": "^4.1.5", + "uncss": "^0.17.3" }, "dependencies": { "bootstrap": "^4.6.0" diff --git a/src/_data/services.json b/src/_data/services.json index 61d9d90..f190189 100644 --- a/src/_data/services.json +++ b/src/_data/services.json @@ -88,7 +88,7 @@ }, { "id": "translate", - "name": "LibreTranslate", + "name": "Translate", "icon": "i-language", "url": "https://translate.sp-codes.de", "status": "https://translate.sp-codes.de", diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk index 470692d..6b154a2 100644 --- a/src/_includes/layouts/base.njk +++ b/src/_includes/layouts/base.njk @@ -31,8 +31,8 @@ title: sp-codes - - + + diff --git a/src/_includes/profiles.html b/src/_includes/profiles.html index 0a33f8f..eb17a7d 100644 --- a/src/_includes/profiles.html +++ b/src/_includes/profiles.html @@ -1,27 +1,27 @@
diff --git a/src/_includes/services-extended.html b/src/_includes/services-extended.html index 470c636..6d1ee22 100644 --- a/src/_includes/services-extended.html +++ b/src/_includes/services-extended.html @@ -6,7 +6,7 @@
TEST-PHASE
{% endif %}
- +

{{service.name}}{% if service.url %} {% endif %}

{% if service.status %} diff --git a/src/_includes/services-simple.html b/src/_includes/services-simple.html index 05e11cf..bd26d69 100644 --- a/src/_includes/services-simple.html +++ b/src/_includes/services-simple.html @@ -6,7 +6,7 @@ {% if service.beta == true %}
TEST-PHASE
{% endif %} - +

{{service.name}}{% if service.url %} {% endif %}

diff --git a/src/favicon.ico b/src/favicon.ico new file mode 100644 index 0000000..3628c15 Binary files /dev/null and b/src/favicon.ico differ diff --git a/src/favicon.png b/src/favicon.png new file mode 100644 index 0000000..b65ac1e Binary files /dev/null and b/src/favicon.png differ diff --git a/src/img/bg.jpg b/src/img/bg.jpg new file mode 100644 index 0000000..7903b40 Binary files /dev/null and b/src/img/bg.jpg differ diff --git a/src/img/bg.png b/src/img/bg.png deleted file mode 100644 index 8b1d392..0000000 Binary files a/src/img/bg.png and /dev/null differ diff --git a/src/img/sp-codes.ico b/src/img/sp-codes.ico deleted file mode 100644 index afa2029..0000000 Binary files a/src/img/sp-codes.ico and /dev/null differ diff --git a/src/scss/main.scss b/src/scss/main.scss index 42a419c..dfad3b0 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -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-reboot"; @import "node_modules/bootstrap/scss/utilities/align"; @@ -9,11 +15,6 @@ @import "node_modules/bootstrap/scss/variables"; @import "node_modules/bootstrap/scss/mixins/_breakpoints"; -$icomoon-font-path: "../font"; -@import "icons/style"; -$flag-icon-path: '../img'; -@import "icons/flags"; - $primary: #fea500; $primary_dark: #e5a52e; @@ -24,7 +25,7 @@ html, body { } body { - background-image: url("../img/bg.png"); + background-image: url("../img/bg.jpg"); color: #fff; font-weight: 300; min-height: 100vh;