From ecc8f46e2b4286a53273517599785f2ab61312e1 Mon Sep 17 00:00:00 2001 From: nevfy Date: Thu, 11 Apr 2024 07:01:47 +0300 Subject: [PATCH 01/12] fix: change broken img look --- assets/scss/_styles_project.scss | 25 ++++++++++++++++++++++++- content/en/_index.html | 8 ++++++-- layouts/shortcodes/landing-feature.html | 8 ++++++-- layouts/shortcodes/landing-service.html | 4 +++- static/images/logos/nlnet.svg | 2 +- 5 files changed, 40 insertions(+), 7 deletions(-) diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index 2c7602d..c25af63 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -74,10 +74,23 @@ .sp-service-icon { margin-top: -4rem; + min-height: 6rem; + min-width: 4rem; max-width: 12rem; max-height: 8rem; margin-left: 2rem; width: max-content; + & > .error { + min-height: 6rem; + min-width: 4rem; + } +} + +.sp-feature-img { + min-height: 20rem; + min-width: 20rem; + max-width: 40rem; + max-height: 40rem; } .sp-service-card { @@ -92,8 +105,9 @@ } .sp-supperted-by-img { - max-height: 5rem; + pointer-events: none; margin: 1rem; + width: 15rem; } .sp-supported-by-list { @@ -129,3 +143,12 @@ a.nav-link.sp-coming-soon { border-radius: .1rem; } } + +.sp-feature-img.error { + min-width: 20rem; + min-height: 20rem; +} + +.error { + background-color: lightgray; +} \ No newline at end of file diff --git a/content/en/_index.html b/content/en/_index.html index c88d2ed..256c2c1 100644 --- a/content/en/_index.html +++ b/content/en/_index.html @@ -193,10 +193,14 @@ linkTitle = "SelfPrivacy"
- NLnet foundation + +
NLnet foundation
+ - Privacy Accelerator + +
Privacy Accelerator
+
diff --git a/layouts/shortcodes/landing-feature.html b/layouts/shortcodes/landing-feature.html index e582cb8..614115a 100644 --- a/layouts/shortcodes/landing-feature.html +++ b/layouts/shortcodes/landing-feature.html @@ -11,13 +11,17 @@ {{ if $illustration }}
- + +
+
{{ end }} {{ else }} {{ if $illustration }}
- + +
+
{{ end }}
diff --git a/layouts/shortcodes/landing-service.html b/layouts/shortcodes/landing-service.html index cf7de98..482669b 100644 --- a/layouts/shortcodes/landing-service.html +++ b/layouts/shortcodes/landing-service.html @@ -1,7 +1,9 @@ {{ $illustration := .Get 0 }} {{ $title := .Get 1 }}
- + +
+

{{ $title }}

{{ .Inner }} diff --git a/static/images/logos/nlnet.svg b/static/images/logos/nlnet.svg index 248e59c..4f0e4e9 100644 --- a/static/images/logos/nlnet.svg +++ b/static/images/logos/nlnet.svg @@ -1,7 +1,7 @@ - + From b8e58cba1f697a5d991661630bcf6220bfaeb789 Mon Sep 17 00:00:00 2001 From: nevfy Date: Fri, 12 Apr 2024 02:19:53 +0300 Subject: [PATCH 02/12] fix: svg placeholder style --- assets/scss/_styles_project.scss | 16 ++++++++++++++-- content/en/_index.html | 10 ++++++++-- layouts/shortcodes/landing-feature.html | 8 ++++++-- layouts/shortcodes/landing-service.html | 4 +++- 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index c25af63..faf49b1 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -82,7 +82,7 @@ width: max-content; & > .error { min-height: 6rem; - min-width: 4rem; + min-width: 6rem; } } @@ -150,5 +150,17 @@ a.nav-link.sp-coming-soon { } .error { - background-color: lightgray; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + text-align: center; + font-size: 2rem; + padding: 1rem; + background-color: transparent; + border: lightgray solid .25rem; + border-radius: .5rem; + & > i { + color: lightgray; + } } \ No newline at end of file diff --git a/content/en/_index.html b/content/en/_index.html index 256c2c1..914d5b1 100644 --- a/content/en/_index.html +++ b/content/en/_index.html @@ -194,12 +194,18 @@ linkTitle = "SelfPrivacy"
-
NLnet foundation
+
+ + NLnet foundation +
-
Privacy Accelerator
+
+ + Privacy Accelerator +
diff --git a/layouts/shortcodes/landing-feature.html b/layouts/shortcodes/landing-feature.html index 614115a..6dd17c9 100644 --- a/layouts/shortcodes/landing-feature.html +++ b/layouts/shortcodes/landing-feature.html @@ -12,7 +12,9 @@ {{ if $illustration }}
-
+
+ +
{{ end }} @@ -20,7 +22,9 @@ {{ if $illustration }}
-
+
+ +
{{ end }} diff --git a/layouts/shortcodes/landing-service.html b/layouts/shortcodes/landing-service.html index 482669b..baee7fa 100644 --- a/layouts/shortcodes/landing-service.html +++ b/layouts/shortcodes/landing-service.html @@ -2,7 +2,9 @@ {{ $title := .Get 1 }}
-
+
+ +

{{ $title }}

From d76c3ba0514075e61c604addbbb1028837fb2bf6 Mon Sep 17 00:00:00 2001 From: nevfy Date: Sun, 14 Apr 2024 00:59:18 +0300 Subject: [PATCH 03/12] fix: remove unused wrapper --- assets/scss/_styles_project.scss | 9 ++------- content/en/_index.html | 5 ++--- layouts/shortcodes/landing-feature.html | 8 ++------ 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index faf49b1..0e123cf 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -104,10 +104,10 @@ margin-top: 6rem; } -.sp-supperted-by-img { +.sp-supported-by-img { pointer-events: none; margin: 1rem; - width: 15rem; + width: 10rem; } .sp-supported-by-list { @@ -144,11 +144,6 @@ a.nav-link.sp-coming-soon { } } -.sp-feature-img.error { - min-width: 20rem; - min-height: 20rem; -} - .error { display: flex; flex-direction: column; diff --git a/content/en/_index.html b/content/en/_index.html index 914d5b1..b6e673f 100644 --- a/content/en/_index.html +++ b/content/en/_index.html @@ -118,7 +118,6 @@ linkTitle = "SelfPrivacy"
-

For a good life

@@ -193,7 +192,7 @@ linkTitle = "SelfPrivacy"
- +
NLnet foundation @@ -201,7 +200,7 @@ linkTitle = "SelfPrivacy"
- +
Privacy Accelerator diff --git a/layouts/shortcodes/landing-feature.html b/layouts/shortcodes/landing-feature.html index 6dd17c9..714b2b7 100644 --- a/layouts/shortcodes/landing-feature.html +++ b/layouts/shortcodes/landing-feature.html @@ -10,23 +10,19 @@ {{ .Inner }}
{{ if $illustration }} -
- +
- {{ end }} {{ else }} {{ if $illustration }} -
- +
- {{ end }}
{{ if $title }} From e0b9f8fe9b92409d1558217834830d87936cc94a Mon Sep 17 00:00:00 2001 From: nevfy Date: Tue, 16 Apr 2024 23:45:07 +0300 Subject: [PATCH 04/12] fix: remove justimg shortcode --- layouts/shortcodes/justimg.html | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 layouts/shortcodes/justimg.html diff --git a/layouts/shortcodes/justimg.html b/layouts/shortcodes/justimg.html deleted file mode 100644 index 0f8d1d9..0000000 --- a/layouts/shortcodes/justimg.html +++ /dev/null @@ -1,2 +0,0 @@ -{{ $original := .Page.Resources.GetMatch (printf "**%s*" (.Get 0)) }} - From c951c3592aba4bde82dfa6b49bae3374479e3e86 Mon Sep 17 00:00:00 2001 From: nevfy Date: Fri, 26 Apr 2024 02:04:04 +0300 Subject: [PATCH 05/12] fix: enable windows download --- content/en/download/_index.html | 2 +- layouts/partials/footer.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/en/download/_index.html b/content/en/download/_index.html index 1cda708..fef2b29 100644 --- a/content/en/download/_index.html +++ b/content/en/download/_index.html @@ -59,7 +59,7 @@ title: Downloads
- + Windows
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index f2f8f3b..568add8 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -52,7 +52,7 @@

{{ T "footer_download_desktop" }}

From 7a2ce768b274ad22b78065cd0da53224647f1e7f Mon Sep 17 00:00:00 2001 From: nevfy Date: Sat, 27 Apr 2024 01:06:31 +0300 Subject: [PATCH 06/12] fix: center blocks on smaller screens --- content/en/download/_index.html | 20 ++++++++++---------- content/ru/download/_index.html | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/content/en/download/_index.html b/content/en/download/_index.html index fef2b29..ff1af1a 100644 --- a/content/en/download/_index.html +++ b/content/en/download/_index.html @@ -14,11 +14,11 @@ title: Downloads {{< blocks/section color="white" type="section" >}} -
-

Android

+
+

Android

-
+
F-Droid @@ -42,22 +42,22 @@ title: Downloads {{< /blocks/section >}} {{< blocks/section color="white" type="section" >}} -
-

iOS

+
+

iOS

-
-

Coming soon

+
+

Coming soon

{{< /blocks/section >}} {{< blocks/section type="section" color="dark" >}} -
-

Desktop

+
+

Desktop

-
+
Windows diff --git a/content/ru/download/_index.html b/content/ru/download/_index.html index 7e35a21..2fa6141 100644 --- a/content/ru/download/_index.html +++ b/content/ru/download/_index.html @@ -3,8 +3,8 @@ title: Скачать --- {{< blocks/lead>}} -
-

Загрузки

+
+

Загрузки

@@ -15,11 +15,11 @@ title: Скачать {{< blocks/section color="white" type="section">}} -

-

Android

+
+

Android

-
+
}} {{< blocks/section color="white" type="section">}} -
-

iOS

+
+

iOS

-
-

Ждите скоро...

+
+

Ждите скоро...

{{< /blocks/section>}} {{< blocks/section type="section" color="dark">}} -
-

Компьютер

+
+

Компьютер

-
+
Date: Sat, 27 Apr 2024 16:17:09 +0300 Subject: [PATCH 07/12] fix: bad merge --- assets/scss/_styles_project.scss | 3 ++- content/en/_index.html | 20 ++++++++++---------- layouts/shortcodes/landing-feature.html | 8 ++++++-- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index 965f53d..3ed9b29 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -190,4 +190,5 @@ a, a.btn-link { border-radius: .5rem; & > i { color: lightgray; - } \ No newline at end of file + } +} \ No newline at end of file diff --git a/content/en/_index.html b/content/en/_index.html index 59b9b41..6664107 100644 --- a/content/en/_index.html +++ b/content/en/_index.html @@ -10,7 +10,7 @@ linkTitle = "SelfPrivacy"