From 6a2230800f470f8535b5015a5529dfcd80ce46c7 Mon Sep 17 00:00:00 2001 From: Luke Date: Tue, 19 Jan 2021 11:51:29 +0100 Subject: [PATCH 1/5] Add notification bar --- _sass/_global.scss | 14 ++++++++++++++ portmaster/index.html | 3 +++ spn/index.html | 3 +++ 3 files changed, 20 insertions(+) diff --git a/_sass/_global.scss b/_sass/_global.scss index 4fb2b6f..bf45960 100644 --- a/_sass/_global.scss +++ b/_sass/_global.scss @@ -442,6 +442,20 @@ input:checked { animation: tooltips-vert 300ms ease-out forwards; } +.notification { + z-index: -1; + position: absolute; + top: -100px; + animation: notification 0.5s forwards ease-in-out; + animation-delay: 0.1s; +} + +@keyframes notification { + 100% { + position: relative; + top: 0; + } +} // This is a hacky way to solve this problem. // I could not find away in tailwind to set a max of cols and to allow diff --git a/portmaster/index.html b/portmaster/index.html index ece64ff..6653666 100644 --- a/portmaster/index.html +++ b/portmaster/index.html @@ -6,6 +6,9 @@ redirect_from: - /download/ --- +
+ Alpha - early software, expect hickups here and there. +
diff --git a/spn/index.html b/spn/index.html index 417e478..a5609b1 100644 --- a/spn/index.html +++ b/spn/index.html @@ -3,6 +3,9 @@ title: Safing Privacy Network layout: page --- +
+ Pre-Alpha - not publicily available, that is why there are no screenshots of the software on this page. Follow Progress on "Next Page" +
From 3ddfb0499b7e4c32c4e82f35c492c8ab1efb618c Mon Sep 17 00:00:00 2001 From: Luke Date: Tue, 19 Jan 2021 14:04:07 +0100 Subject: [PATCH 2/5] Add faq link --- _sass/_global.scss | 1 - spn/index.html | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_sass/_global.scss b/_sass/_global.scss index bf45960..d7e9369 100644 --- a/_sass/_global.scss +++ b/_sass/_global.scss @@ -443,7 +443,6 @@ input:checked { } .notification { - z-index: -1; position: absolute; top: -100px; animation: notification 0.5s forwards ease-in-out; diff --git a/spn/index.html b/spn/index.html index a5609b1..3285461 100644 --- a/spn/index.html +++ b/spn/index.html @@ -4,7 +4,8 @@ layout: page ---
- Pre-Alpha - not publicily available, that is why there are no screenshots of the software on this page. Follow Progress on "Next Page" + Pre-Alpha - not publicily available, that is why there are no screenshots of the software on this page. + Read FAQ
@@ -232,7 +233,7 @@ layout: page
-
+
From 78d02691038814ae1ce2639c11289da0cd258859 Mon Sep 17 00:00:00 2001 From: Luke Date: Wed, 20 Jan 2021 13:24:52 +0100 Subject: [PATCH 3/5] Update animation This is due to firefox having a weird bug, where when loading a page it lags the playing animation. --- _sass/_global.scss | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/_sass/_global.scss b/_sass/_global.scss index d7e9369..a900171 100644 --- a/_sass/_global.scss +++ b/_sass/_global.scss @@ -443,16 +443,15 @@ input:checked { } .notification { - position: absolute; - top: -100px; - animation: notification 0.5s forwards ease-in-out; + position: relative; + opacity: 0; + animation: notification 0.5s forwards ease-in; animation-delay: 0.1s; } @keyframes notification { 100% { - position: relative; - top: 0; + opacity: 1; } } From ab31ed47f4022c69ad5911d2eefb713b467fe24c Mon Sep 17 00:00:00 2001 From: Luke Date: Wed, 20 Jan 2021 13:25:17 +0100 Subject: [PATCH 4/5] Add icon --- assets/img/icons/info.svg | 7 +++++++ portmaster/index.html | 5 ++++- spn/index.html | 9 ++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 assets/img/icons/info.svg diff --git a/assets/img/icons/info.svg b/assets/img/icons/info.svg new file mode 100644 index 0000000..57f545a --- /dev/null +++ b/assets/img/icons/info.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/portmaster/index.html b/portmaster/index.html index 6653666..a4c878d 100644 --- a/portmaster/index.html +++ b/portmaster/index.html @@ -7,7 +7,10 @@ redirect_from: ---
- Alpha - early software, expect hickups here and there. +
+ + Alpha - early software, expect hickups here and there. +
diff --git a/spn/index.html b/spn/index.html index 3285461..1dc3f74 100644 --- a/spn/index.html +++ b/spn/index.html @@ -3,9 +3,12 @@ title: Safing Privacy Network layout: page --- -
- Pre-Alpha - not publicily available, that is why there are no screenshots of the software on this page. - Read FAQ +
+
+ + Pre-Alpha - not publicily available, that is why there are no screenshots of the software on this page. + Read FAQ +
From 798e318da84905656e764599a06b7a520e7f65df Mon Sep 17 00:00:00 2001 From: davegson <3080765+davegson@users.noreply.github.com> Date: Thu, 21 Jan 2021 12:34:52 +0100 Subject: [PATCH 5/5] Adapt notification texts for SPN/PM page --- portmaster/index.html | 2 +- spn/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portmaster/index.html b/portmaster/index.html index a4c878d..24eb781 100644 --- a/portmaster/index.html +++ b/portmaster/index.html @@ -9,7 +9,7 @@ redirect_from:
- Alpha - early software, expect hickups here and there. + Portmaster is Alpha Software - expect hickups here and there
diff --git a/spn/index.html b/spn/index.html index 1dc3f74..adbb5d5 100644 --- a/spn/index.html +++ b/spn/index.html @@ -6,7 +6,7 @@ layout: page
- Pre-Alpha - not publicily available, that is why there are no screenshots of the software on this page. + SPN is in Pre-Alpha and not publicily available. That is why there are no screenshots of the software on this page. Read FAQ