diff --git a/.drone.yml b/.drone.yml index 3a7d286..e2c0cbd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,24 @@ steps: commands: - npm install - npm run build - - name: deploy + - name: deploy-develop + image: alpine + environment: + FTP_HOST: + from_secret: FTP_HOST + FTP_USERNAME: + from_secret: FTP_USERNAME + FTP_PASSWORD: + from_secret: FTP_PASSWORD + commands: + - which lftp || ( apk --update add lftp ) + - lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/ dev.samuel-philipp.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST + when: + branch: + - develop + event: + - push + - name: deploy-master image: alpine environment: FTP_HOST: diff --git a/README.md b/README.md index 671c577..98e843d 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ Website for samuel-philipp.de The following Parameters are set directly on the Web-Server. ``` -Content-Security-Policy: default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; font-src 'self'; frame-ancestors 'none'; base-uri 'self'; form-action 'none' -Referrer-Policy: same-origin +Content-Security-Policy: default-src 'none'; script-src 'self' https://plausible.sp-codes.de; object-src 'none'; style-src 'self'; img-src 'self' https://img.shields.io; media-src 'none'; frame-src 'none'; font-src 'self'; connect-src 'self' https://plausible.sp-codes.de +Referrer-Policy: strict-origin-when-cross-origin Feature-Policy: sync-xhr 'self' Strict-Transport-Security: max-age=31536000; includeSubDomains; preload X-Content-Type-Options: nosniff @@ -21,4 +21,4 @@ X-Frame-Options: DENY X-XSS-Protection: 1; mode=block ``` -There is also a `301` Redirect from http to https. \ No newline at end of file +There is also a `301` Redirect from http to https. diff --git a/renovate.json b/renovate.json index 7e23eca..3b73487 100644 --- a/renovate.json +++ b/renovate.json @@ -3,7 +3,7 @@ "samuel-p" ], "baseBranches": [ - "master" + "develop" ], "rangeStrategy": "bump" } diff --git a/src/img/bg.png b/src/img/bg.png index d2e51e0..8b1d392 100644 Binary files a/src/img/bg.png and b/src/img/bg.png differ diff --git a/src/index.html b/src/index.html index 91a3a85..7fd04a7 100644 --- a/src/index.html +++ b/src/index.html @@ -31,41 +31,66 @@ + -
-
-
-
-

Software Engineer

+
+
+ +
+
+
+
+

Software Engineer

+
+
+
+

Magician

+
+
+ + + + + + + + + + +
+ + + +
-
-
-

Magician

+
+
+
+
Made with in Germany
+
Samuel Philipp
+
+
+
+
Impressum +
+
Datenschutz +
+
Code
+ +
+
- - - - - - - - - - -
-
Imprint
-
Privacy
-
Code
-
-
- Mastodon -
diff --git a/src/scss/main.scss b/src/scss/main.scss index 39ba1ff..f86d2a8 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -18,10 +18,24 @@ body { -webkit-tap-highlight-color: rgba(0, 0, 0, 0); padding: 0; margin: 0; +} - &.legal { +.site-container { + width: 100%; + height: 100vh; + display: flex; + flex-direction: column; + overflow: hidden; + + .content { + position: relative; + flex: 1 1 auto; + } + + .footer { background-image: url("../img/bg.png"); - padding: 2%; + color: #ffffff; + z-index: 1; } } @@ -30,7 +44,7 @@ body { background-repeat: no-repeat; background-position: center center; background-size: cover; - position: fixed; + position: absolute; top: -25px; left: -25px; width: calc(100% + 50px); @@ -38,6 +52,14 @@ body { z-index: 0; } +.follow { + position: absolute; + top: 0; + right: 0; + padding: 1rem; + z-index: 1; +} + #developer { background-image: url('../img/sp-codes.png'); } @@ -47,7 +69,7 @@ body { } .headers { - position: fixed; + position: absolute; top: 0; left: 0; width: 100%; @@ -111,19 +133,14 @@ body { } .menu { - position: fixed; - right: 0; - bottom: 0; - background-color: rgba(255, 255, 255, 0.6); border-top: 1px solid #ffffff; - border-left: 1px solid #ffffff; - border-top-left-radius: 8px; + + a { + color: #ffffff; + } } -.menu a { - color: #000000; +.full-size { + width: 100%; + height: 100%; } - -.menu a:hover { - color: #222222; -} \ No newline at end of file