From d4d5204f370c2c1467a81f2a1f9a0f251cddb5eb Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 4 Oct 2021 15:40:09 +0200 Subject: [PATCH] feat: switch to new favicon --- gulpfile.js | 45 +++++---- layouts/partials/head/favicons.html | 3 +- package-lock.json | 6 ++ package.json | 3 +- src/favicon/favicon-main.svg | 71 +++++--------- static/brand.svg | 141 +++++----------------------- 6 files changed, 82 insertions(+), 187 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index b56acbb..58274ac 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,4 +1,5 @@ const gulp = require("gulp"); +const rename = require("gulp-rename"); const realFavicon = require("gulp-real-favicon"); const fs = require("fs"); @@ -21,6 +22,13 @@ gulp.task("prepare", function (done) { done(); }); +gulp.task("favicon-svg", function () { + return gulp + .src("src/favicon/favicon-main.svg") + .pipe(rename("favicon.svg")) + .pipe(gulp.dest("static/favicon/")); +}); + gulp.task("favicon-generate", function (done) { realFavicon.generateFavicon( { @@ -30,24 +38,21 @@ gulp.task("favicon-generate", function (done) { design: { ios: { pictureAspect: "backgroundAndMargin", - backgroundColor: "#4186c9", - margin: "0", + backgroundColor: "#2f333e", + margin: "32%", assets: { - ios6AndPriorIcons: false, - ios7AndLaterIcons: false, + ios6AndPriorIcons: true, + ios7AndLaterIcons: true, precomposedIcons: false, declareOnlyDefaultIcon: true, }, }, - desktopBrowser: {}, + desktopBrowser: { + design: "raw", + }, windows: { - masterPicture: { - type: "inline", - content: - "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjwhLS0gQ3JlYXRlZCB3aXRoIElua3NjYXBlIChodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy8pIC0tPgoKPHN2ZwogICB3aWR0aD0iNTAwIgogICBoZWlnaHQ9IjUwMCIKICAgdmlld0JveD0iMCAwIDEzMi4yOTE2NyAxMzIuMjkxNjciCiAgIHZlcnNpb249IjEuMSIKICAgaWQ9InN2ZzU1OSIKICAgaW5rc2NhcGU6dmVyc2lvbj0iMS4xIChjNjhlMjJjMzg3LCAyMDIxLTA1LTIzKSIKICAgc29kaXBvZGk6ZG9jbmFtZT0iYXZhdGFyX3Jhdy5zdmciCiAgIHhtbG5zOmlua3NjYXBlPSJodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy9uYW1lc3BhY2VzL2lua3NjYXBlIgogICB4bWxuczpzb2RpcG9kaT0iaHR0cDovL3NvZGlwb2RpLnNvdXJjZWZvcmdlLm5ldC9EVEQvc29kaXBvZGktMC5kdGQiCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgPHNvZGlwb2RpOm5hbWVkdmlldwogICAgIGlkPSJuYW1lZHZpZXc1NjEiCiAgICAgcGFnZWNvbG9yPSIjZmZmZmZmIgogICAgIGJvcmRlcmNvbG9yPSIjNjY2NjY2IgogICAgIGJvcmRlcm9wYWNpdHk9IjEuMCIKICAgICBpbmtzY2FwZTpwYWdlc2hhZG93PSIyIgogICAgIGlua3NjYXBlOnBhZ2VvcGFjaXR5PSIwIgogICAgIGlua3NjYXBlOnBhZ2VjaGVja2VyYm9hcmQ9IjAiCiAgICAgaW5rc2NhcGU6ZG9jdW1lbnQtdW5pdHM9Im1tIgogICAgIHNob3dncmlkPSJmYWxzZSIKICAgICBpbmtzY2FwZTp6b29tPSIwLjY0NzY1MDExIgogICAgIGlua3NjYXBlOmN4PSIyODMuMzMyIgogICAgIGlua3NjYXBlOmN5PSI0NjkuMzg5MjUiCiAgICAgaW5rc2NhcGU6d2luZG93LXdpZHRoPSIyNTYwIgogICAgIGlua3NjYXBlOndpbmRvdy1oZWlnaHQ9IjEzODAiCiAgICAgaW5rc2NhcGU6d2luZG93LXg9IjAiCiAgICAgaW5rc2NhcGU6d2luZG93LXk9IjMyIgogICAgIGlua3NjYXBlOndpbmRvdy1tYXhpbWl6ZWQ9IjEiCiAgICAgaW5rc2NhcGU6Y3VycmVudC1sYXllcj0ibGF5ZXIxIgogICAgIHVuaXRzPSJweCIgLz4KICA8ZGVmcwogICAgIGlkPSJkZWZzNTU2IiAvPgogIDxnCiAgICAgaW5rc2NhcGU6bGFiZWw9IkViZW5lIDEiCiAgICAgaW5rc2NhcGU6Z3JvdXBtb2RlPSJsYXllciIKICAgICBpZD0ibGF5ZXIxIgogICAgIHRyYW5zZm9ybT0idHJhbnNsYXRlKC00OC40MTY4OTQsLTExMy40MzY4NikiPgogICAgPGcKICAgICAgIGlkPSJnMzItNiIKICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmYiCiAgICAgICB0cmFuc2Zvcm09Im1hdHJpeCgwLjQxNDM5NzM4LDAsMCwwLjQyNDgzNDQ2LC00Ny45NzQ1NjYsLTE3Ny40MzUxNCkiIC8+CiAgICA8ZwogICAgICAgaWQ9ImczNi02IgogICAgICAgc3R5bGU9ImZpbGw6I2ZmZmZmZiIKICAgICAgIHRyYW5zZm9ybT0ibWF0cml4KDAuNDE0Mzk3MzgsMCwwLDAuNDI0ODM0NDYsLTQ3Ljk3NDU2NiwtMTc3LjQzNTE0KSIgLz4KICAgIDxnCiAgICAgICBpZD0iZzUwMzQiCiAgICAgICB0cmFuc2Zvcm09Im1hdHJpeCgyLjgyNTEzMTEsMCwwLDIuODI1MTMxMSwtMjA3LjYxNTQ5LC00NDQuOTI5MzkpIj4KICAgICAgPHBhdGgKICAgICAgICAgY2xhc3M9InN0MSIKICAgICAgICAgZD0ibSAxMTAuMDA0OTEsMjE1LjUxNDU5IC0xNC43MTUzNjgsLTUuOTkwMzQgYyAtMS45MTgwMjcsLTAuNzc5MDEgLTQuMDAzNzQ1LDAuNjY2MTkgLTQuMDAzNzQ1LDIuNzgyOTYgdiAxNy40OTI4NSBjIDAsMi4wNjg0MyAyLjAwMTg2OCwzLjUxODk5IDMuOTA0MTczLDIuODI1OTQgbCAxNC43MTUzNywtNS4zNjcxMyBjIDEuMTYzMzgsLTAuNDI0NDIgMS45NDQyMiwtMS41NTgwMiAxLjk0NDIyLC0yLjgyNTk0IHYgLTYuMTM1MzggYyAwLC0xLjIyNDk0IC0wLjcyODQ0LC0yLjMzMTY4IC0xLjg0NDY1LC0yLjc4Mjk2IHoiCiAgICAgICAgIGlkPSJwYXRoNDQiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7c3Ryb2tlLXdpZHRoOjAuNTMwNjA5IiAvPgogICAgICA8cGF0aAogICAgICAgICBjbGFzcz0ic3QxIgogICAgICAgICBkPSJtIDEzMi43OTA2NCwyMDkuNTI0MjUgLTE0LjcxNTM1LDUuOTkwMzQgYyAtMS4xMTA5OSwwLjQ1MTI4IC0xLjg0NDY2LDEuNTU4MDIgLTEuODQ0NjYsMi43ODI5NiB2IDYuMTM1MzggYyAwLDEuMjY3OTIgMC43ODA4MywyLjM5NjE0IDEuOTQ0MjMsMi44MjU5NCBsIDE0LjcxNTM0LDUuMzY3MTMgYyAxLjkwMjMyLDAuNjkzMDUgMy45MDQxOSwtMC43NTIxNSAzLjkwNDE5LC0yLjgyNTk0IHYgLTE3LjQ5Mjg1IGMgLTAuMDA2LC0yLjExNjc3IC0yLjA4NTcyLC0zLjU2MTk3IC00LjAwMzc1LC0yLjc4Mjk2IHoiCiAgICAgICAgIGlkPSJwYXRoNDYiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7c3Ryb2tlLXdpZHRoOjAuNTMwNjA5IiAvPgogICAgPC9nPgogIDwvZz4KPC9zdmc+Cg==", - }, - pictureAspect: "noChange", - backgroundColor: "#4186c9", + pictureAspect: "whiteSilhouette", + backgroundColor: "#2f333e", onConflict: "override", assets: { windows80Ie10Tile: false, @@ -60,9 +65,12 @@ gulp.task("favicon-generate", function (done) { }, }, androidChrome: { - pictureAspect: "shadow", + pictureAspect: "backgroundAndMargin", + margin: "19%", + backgroundColor: "#2f333e", themeColor: "#2f333e", manifest: { + name: "the Geeklab", display: "standalone", orientation: "notSet", onConflict: "override", @@ -74,8 +82,7 @@ gulp.task("favicon-generate", function (done) { }, }, safariPinnedTab: { - pictureAspect: "blackAndWhite", - threshold: 58.75, + pictureAspect: "silhouette", themeColor: "#4186c9", }, }, @@ -112,5 +119,11 @@ gulp.task("clean", function () { gulp.task( "favicon", - gulp.series("clean", "prepare", "favicon-generate", "favicon-check-update") + gulp.series( + "clean", + "prepare", + "favicon-svg", + "favicon-generate", + "favicon-check-update" + ) ); diff --git a/layouts/partials/head/favicons.html b/layouts/partials/head/favicons.html index 23e63b2..270fb07 100644 --- a/layouts/partials/head/favicons.html +++ b/layouts/partials/head/favicons.html @@ -1,7 +1,8 @@ + - + diff --git a/package-lock.json b/package-lock.json index 78bfa19..97f072c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1824,6 +1824,12 @@ } } }, + "gulp-rename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz", + "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==", + "dev": true + }, "gulplog": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", diff --git a/package.json b/package.json index 2e44477..1b7a644 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "gulpfile.js", "scripts": { "gulp": "gulp", - "server": "hugo server -D -F -s exampleSite/" + "server": "hugo server -D -F" }, "repository": { "type": "git", @@ -17,6 +17,7 @@ "del": "6.0.0", "gulp": "4.0.2", "gulp-real-favicon": "0.3.2", + "gulp-rename": "^2.0.0", "through2": "4.0.2" } } diff --git a/src/favicon/favicon-main.svg b/src/favicon/favicon-main.svg index 31d00b6..456cace 100644 --- a/src/favicon/favicon-main.svg +++ b/src/favicon/favicon-main.svg @@ -1,71 +1,44 @@ - - + inkscape:current-layer="Layer_1" /> - - - - - - - - - + id="defs4"> + + + diff --git a/static/brand.svg b/static/brand.svg index afae4b5..60ec266 100644 --- a/static/brand.svg +++ b/static/brand.svg @@ -1,143 +1,44 @@ - - + inkscape:current-layer="Layer_1" /> - - + id="defs4"> + - - - - - - - - - - - - - - +