From b97eb4051780c0c856e981571a211be5f1182253 Mon Sep 17 00:00:00 2001 From: Samuel Philipp Date: Tue, 9 May 2023 00:16:46 +0200 Subject: [PATCH] added menu and caret --- package.json | 14 ++--- src/_data/{site.json => global.json} | 15 ++++- src/_data/i18n/de.json | 2 +- src/_data/i18n/en.json | 2 +- src/_data/site.js | 2 +- src/index.html | 74 ++++++++++++++++--------- src/scss/main.scss | 82 +++++++++++++++++++++++++++- 7 files changed, 154 insertions(+), 37 deletions(-) rename src/_data/{site.json => global.json} (71%) diff --git a/package.json b/package.json index a0475ed..86e8a59 100644 --- a/package.json +++ b/package.json @@ -19,19 +19,19 @@ "browser-sync": "^2.28.1" }, "devDependencies": { - "@11ty/eleventy": "^2.0.0", + "@11ty/eleventy": "^2.0.1", "@11ty/eleventy-navigation": "^0.3.5", - "@node-minify/core": "^8.0.5", - "@node-minify/crass": "^8.0.5", - "@node-minify/html-minifier": "^8.0.5", + "@node-minify/core": "^8.0.6", + "@node-minify/crass": "^8.0.6", + "@node-minify/html-minifier": "^8.0.6", "@sardine/eleventy-plugin-tinyhtml": "^0.2.0", "cpx": "^1.5.0", "eleventy-plugin-rev": "^1.1.1", "eleventy-sass": "^2.2.1", - "glob": "^9.1.2", + "glob": "^10.2.2", "minify": "^9.2.0", - "postcss": "^8.4.21", - "sass": "^1.58.3", + "postcss": "^8.4.23", + "sass": "^1.62.1", "uncss": "^0.17.3" }, "dependencies": { diff --git a/src/_data/site.json b/src/_data/global.json similarity index 71% rename from src/_data/site.json rename to src/_data/global.json index 1ca5f23..efbd6eb 100644 --- a/src/_data/site.json +++ b/src/_data/global.json @@ -16,5 +16,18 @@ "icon": "de", "url": "https://samuel-philipp.de" } - ] + ], + "menu": { + "title": { + "de": "Menü", + "en": "Menu" + }, + "items": [ + "about", + "resume", + "projects", + "skills", + "interests" + ] + } } diff --git a/src/_data/i18n/de.json b/src/_data/i18n/de.json index f0ec888..30f5c84 100644 --- a/src/_data/i18n/de.json +++ b/src/_data/i18n/de.json @@ -36,7 +36,7 @@ "company": "AV-TEST GmbH", "url": "https://www.av-test.org", "start": "Jan. 2018", - "end": "heute", + "end": "Apr. 2023", "descriptions": [ "Threat Intelligence Plattform av-atlas.org", "Automatisierte Datenschutzanalyse von Android Apps", diff --git a/src/_data/i18n/en.json b/src/_data/i18n/en.json index 4dde7a8..ce0b7fa 100644 --- a/src/_data/i18n/en.json +++ b/src/_data/i18n/en.json @@ -36,7 +36,7 @@ "company": "AV-TEST GmbH", "url": "https://www.av-test.org", "start": "Jan. 2018", - "end": "now", + "end": "Apr. 2023", "descriptions": [ "Threat Intelligence Platform av-atlas.org", "Automated privacy analysis of Android apps", diff --git a/src/_data/site.js b/src/_data/site.js index 6832504..b22ee0f 100644 --- a/src/_data/site.js +++ b/src/_data/site.js @@ -1,4 +1,4 @@ -const site = require("./site.json"); +const site = require("./global.json"); site.buildTime = new Date(); site.lang = process.env.LANGUAGE || 'en'; diff --git a/src/index.html b/src/index.html index d9e3f83..6a4b787 100644 --- a/src/index.html +++ b/src/index.html @@ -42,30 +42,54 @@ title: {{site.title}}
-
-
- -

{{site.title}}

-

{{site.subtitle}}

- - +
+
+ +
+ Samuel Philipp +

{{site.title}}

+

{{site.subtitle}}

+ + +
+
+ +
@@ -178,7 +202,7 @@ title: {{site.title}}
-
+
diff --git a/src/scss/main.scss b/src/scss/main.scss index 883b271..f20931b 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -18,6 +18,7 @@ body { -webkit-tap-highlight-color: rgba(0, 0, 0, 0); padding: 0; margin: 0; + //overflow-anchor: none; } header { @@ -52,6 +53,85 @@ header { a { color: #fff !important; } + + .scroll-down { + display: block; + position: absolute; + z-index: 100; + bottom: 45px; + left: 50%; + margin-left: -24px; + width: 48px; + height: 48px; + -webkit-animation: bounce 4s 2s infinite; + animation: bounce 4s 2s infinite; + } + + @-webkit-keyframes bounce { + 0%, 100%, 20%, 50%, 80% { + -webkit-transform: translateY(0); + transform: translateY(0) + } + 40% { + -webkit-transform: translateY(-30px); + transform: translateY(-30px) + } + 60% { + -webkit-transform: translateY(-15px); + transform: translateY(-15px) + } + } + + @keyframes bounce { + 0%, 100%, 20%, 50%, 80% { + -webkit-transform: translateY(0); + -ms-transform: translateY(0); + transform: translateY(0) + } + 40% { + -webkit-transform: translateY(-30px); + -ms-transform: translateY(-30px); + transform: translateY(-30px) + } + 60% { + -webkit-transform: translateY(-15px); + -ms-transform: translateY(-15px); + transform: translateY(-15px) + } + } +} + +.nav { + display: flex; + justify-content: center; + flex-wrap: wrap; + + .items { + display: flex; + padding: 1rem; + //border: 1px solid #fff; + //border-top: none; + } +} + +.menu { + a { + color: #fff; + text-decoration: none; + margin-right: 2rem; + + &:hover { + text-decoration: underline; + } + } + + .item:last-child a { + margin-right: 0; + } + + .active a { + font-weight: bold; + } } ul.social-icons { @@ -404,7 +484,7 @@ section { } } -#services, #interests { +#projects, #interests { color: #fff; background-image: url(../img/bg.jpg); }