From 22274eed290a788413486eb1e47b3b41e0a9aec7 Mon Sep 17 00:00:00 2001 From: samuel-p Date: Mon, 14 Jun 2021 12:10:57 +0200 Subject: [PATCH 1/6] updated icons to custom font (icomoon) --- .eleventy.js | 4 +- package.json | 4 +- src/_data/services.json | 22 +-- src/_includes/layouts/base.njk | 19 ++- src/_includes/layouts/services.njk | 2 +- src/_includes/licenses.html | 2 +- src/_includes/profiles.html | 24 +-- src/_includes/services-extended.html | 4 +- src/_includes/services-simple.html | 4 +- src/de/all-donations.html | 2 +- src/de/blog.md | 2 +- src/de/contact.html | 14 +- src/de/donate.html | 16 +- src/de/imprint.html | 2 +- src/de/index.html | 2 +- src/de/privacy.html | 2 +- src/de/services.html | 4 +- src/de/services/connectivitycheck.md | 2 +- src/de/services/firefox-sync.md | 2 +- src/de/services/gitea.md | 2 +- src/de/services/invidious.md | 2 +- src/de/services/jitsi.md | 2 +- src/de/services/matrix.md | 2 +- src/de/services/nitter.md | 2 +- src/de/services/searx.md | 2 +- src/de/services/shields.md | 2 +- src/en/all-donations.html | 2 +- src/en/blog.md | 2 +- src/en/contact.html | 14 +- src/en/donate.html | 14 +- src/en/imprint.html | 2 +- src/en/index.html | 2 +- src/en/privacy.html | 2 +- src/en/services.html | 4 +- src/en/services/connectivitycheck.md | 2 +- src/en/services/firefox-sync.md | 2 +- src/en/services/gitea.md | 2 +- src/en/services/invidious.md | 2 +- src/en/services/jitsi.md | 2 +- src/en/services/matrix.md | 2 +- src/en/services/nitter.md | 2 +- src/en/services/searx.md | 2 +- src/en/services/shields.md | 2 +- src/font/icomoon.eot | Bin 0 -> 10408 bytes src/font/icomoon.svg | 45 ++++++ src/font/icomoon.ttf | Bin 0 -> 10244 bytes src/font/icomoon.woff | Bin 0 -> 10320 bytes src/font/icomoon.woff2 | Bin 0 -> 5856 bytes src/img/de.svg | 5 + src/img/icon/bars.svg | 1 - src/img/icon/book.svg | 1 - src/img/icon/comment-dots.svg | 1 - src/img/icon/comments.svg | 1 - src/img/icon/envelope.svg | 1 - src/img/icon/firefox-browser.svg | 1 - src/img/icon/gitea.svg | 1 - src/img/icon/github.svg | 1 - src/img/icon/hand-holding-heart.svg | 1 - src/img/icon/home.svg | 1 - src/img/icon/language.svg | 1 - src/img/icon/mastodon.svg | 1 - src/img/icon/matrix.svg | 1 - src/img/icon/opencollective.svg | 1 - src/img/icon/search.svg | 1 - src/img/icon/server.svg | 1 - src/img/icon/stackoverflow.svg | 1 - src/img/icon/tags.svg | 1 - src/img/icon/threema.svg | 1 - src/img/icon/twitter.svg | 1 - src/img/icon/users.svg | 1 - src/img/icon/wifi.svg | 1 - src/img/icon/xmpp.svg | 1 - src/img/icon/youtube.svg | 1 - src/img/us.svg | 10 ++ src/scss/icons.scss | 55 ------- src/scss/icons/flags.scss | 24 +++ src/scss/icons/style.scss | 225 +++++++++++++++++++++++++++ src/scss/icons/variables.scss | 39 +++++ src/scss/main.scss | 11 +- 79 files changed, 453 insertions(+), 192 deletions(-) create mode 100644 src/font/icomoon.eot create mode 100644 src/font/icomoon.svg create mode 100644 src/font/icomoon.ttf create mode 100644 src/font/icomoon.woff create mode 100644 src/font/icomoon.woff2 create mode 100644 src/img/de.svg delete mode 100644 src/img/icon/bars.svg delete mode 100644 src/img/icon/book.svg delete mode 100644 src/img/icon/comment-dots.svg delete mode 100644 src/img/icon/comments.svg delete mode 100644 src/img/icon/envelope.svg delete mode 100644 src/img/icon/firefox-browser.svg delete mode 100644 src/img/icon/gitea.svg delete mode 100644 src/img/icon/github.svg delete mode 100644 src/img/icon/hand-holding-heart.svg delete mode 100644 src/img/icon/home.svg delete mode 100644 src/img/icon/language.svg delete mode 100644 src/img/icon/mastodon.svg delete mode 100644 src/img/icon/matrix.svg delete mode 100644 src/img/icon/opencollective.svg delete mode 100644 src/img/icon/search.svg delete mode 100644 src/img/icon/server.svg delete mode 100644 src/img/icon/stackoverflow.svg delete mode 100644 src/img/icon/tags.svg delete mode 100644 src/img/icon/threema.svg delete mode 100644 src/img/icon/twitter.svg delete mode 100644 src/img/icon/users.svg delete mode 100644 src/img/icon/wifi.svg delete mode 100644 src/img/icon/xmpp.svg delete mode 100644 src/img/icon/youtube.svg create mode 100644 src/img/us.svg delete mode 100644 src/scss/icons.scss create mode 100644 src/scss/icons/flags.scss create mode 100644 src/scss/icons/style.scss create mode 100644 src/scss/icons/variables.scss diff --git a/.eleventy.js b/.eleventy.js index 67d1c3d..577f27c 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -7,9 +7,7 @@ module.exports = function (eleventyConfig) { eleventyConfig.setUseGitIgnore(false); eleventyConfig.addPassthroughCopy({ "src/img": "img", - "src/font": "font", - "node_modules/@fortawesome/fontawesome-free/webfonts/": "font", - "node_modules/flag-icon-css/flags/4x3/(de|us)*": "flags" + "src/font": "font" }); eleventyConfig.addShortcode("translatedUrl", function (currentLocale, newLocale) { return this.page.url.replace(new RegExp(`\/${currentLocale}\/`), `/${newLocale}/`); diff --git a/package.json b/package.json index 8fb77eb..f587a95 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,6 @@ "npm-run-all": "^4.1.5" }, "dependencies": { - "@fortawesome/fontawesome-free": "^5.15.3", - "bootstrap": "^4.6.0", - "flag-icon-css": "^3.5.0" + "bootstrap": "^4.6.0" } } diff --git a/src/_data/services.json b/src/_data/services.json index 4021de7..61d9d90 100644 --- a/src/_data/services.json +++ b/src/_data/services.json @@ -2,7 +2,7 @@ { "id": "searx", "name": "Searx", - "icon": "si si-search", + "icon": "i-search", "url": "https://searx.sp-codes.de", "status": "https://searx.sp-codes.de", "summary": { @@ -13,7 +13,7 @@ { "id": "matrix", "name": "Matrix", - "icon": "si si-comments", + "icon": "i-comments", "url": "https://chat.sp-codes.de", "status": "https://matrix.sp-codes.de/_matrix/static/", "summary": { @@ -24,7 +24,7 @@ { "id": "jitsi", "name": "Jitsi Meet", - "icon": "si si-users", + "icon": "i-users", "url": "https://jitsi.sp-codes.de", "status": "https://jitsi.sp-codes.de", "summary": { @@ -35,7 +35,7 @@ { "id": "mastodon", "name": "Mastodon", - "icon": "si si-mastodon", + "icon": "i-mastodon", "url": "https://social.sp-codes.de", "status": "https://social.sp-codes.de/health", "beta": true, @@ -47,7 +47,7 @@ { "id": "gitea", "name": "Gitea", - "icon": "si si-gitea", + "icon": "i-gitea", "url": "https://git.sp-codes.de", "status": "https://git.sp-codes.de", "summary": { @@ -58,7 +58,7 @@ { "id": "connectivitycheck", "name": "Captive Portal Check", - "icon": "si si-wifi", + "icon": "i-wifi", "status": "https://connectivitycheck.sp-codes.de/generate204", "summary": { "de": "Eine datenschutzfreundliches Tool, um Anmeldeseiten in WLAN-Netzwerken zu erkennen.", @@ -68,7 +68,7 @@ { "id": "firefox-sync", "name": "Firefox Sync", - "icon": "si si-firefox-browser", + "icon": "i-firefox", "status": "https://sync.firefox.sp-codes.de/token/", "summary": { "de": "Ein Service um Firefox Einstellungen, Lesezeichen, offene Tabs und vieles mehr über verschiedene Geräte zu synchronisieren.", @@ -78,7 +78,7 @@ { "id": "shields", "name": "Shields", - "icon": "si si-tags", + "icon": "i-tags", "url": "https://shields.sp-codes.de", "status": "https://shields.sp-codes.de", "summary": { @@ -89,7 +89,7 @@ { "id": "translate", "name": "LibreTranslate", - "icon": "si si-language", + "icon": "i-language", "url": "https://translate.sp-codes.de", "status": "https://translate.sp-codes.de", "beta": true, @@ -101,7 +101,7 @@ { "id": "invidious", "name": "Invidious", - "icon": "si si-youtube", + "icon": "i-youtube", "url": "https://invidious.sp-codes.de", "status": "https://invidious.sp-codes.de", "summary": { @@ -112,7 +112,7 @@ { "id": "nitter", "name": "Nitter", - "icon": "si si-twitter", + "icon": "i-twitter", "url": "https://nitter.sp-codes.de", "status": "https://nitter.sp-codes.de", "summary": { diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk index fc410de..470692d 100644 --- a/src/_includes/layouts/base.njk +++ b/src/_includes/layouts/base.njk @@ -33,21 +33,20 @@ title: sp-codes -