From a22f5eebbb595956de5d04f9b501994899cd6b67 Mon Sep 17 00:00:00 2001 From: nevfy Date: Mon, 8 Apr 2024 02:58:03 +0300 Subject: [PATCH 1/5] fix: remove .gitmodules --- .gitmodules | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index a1524f2..0000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ - -[submodule "themes/docsy"] - path = themes/docsy - url = https://github.com/google/docsy From 0548dcd42450ea8bea476cec59a7762d023e2593 Mon Sep 17 00:00:00 2001 From: nevfy Date: Mon, 8 Apr 2024 04:41:59 +0300 Subject: [PATCH 2/5] fix(docs): reorder toc --- content/en/docs/About us/_index.md | 2 +- content/en/docs/About us/policy.md | 2 +- content/en/docs/About us/roadmap.md | 2 +- content/en/docs/About us/team.md | 2 +- content/en/docs/Backups/_index.md | 2 +- content/en/docs/Contributing/_index.md | 2 +- content/en/docs/FAQ/_index.md | 2 +- content/en/docs/Getting started/_index.md | 2 +- content/en/docs/How To Guides/_index.md | 2 +- content/en/docs/Overview/_index.md | 39 ----------------------- content/en/docs/Services/bitwarden.md | 1 + content/en/docs/Services/delta-chat.md | 1 + content/en/docs/Services/email/_index.md | 1 + content/en/docs/Services/gitea.md | 1 + content/en/docs/Services/jitsi.md | 1 + content/en/docs/Services/nextcloud.md | 1 + content/en/docs/Services/pleroma.md | 1 + content/en/docs/Theory/_index.md | 2 +- 18 files changed, 17 insertions(+), 49 deletions(-) delete mode 100644 content/en/docs/Overview/_index.md diff --git a/content/en/docs/About us/_index.md b/content/en/docs/About us/_index.md index f26a3ca..fc53dcd 100644 --- a/content/en/docs/About us/_index.md +++ b/content/en/docs/About us/_index.md @@ -1,7 +1,7 @@ --- title: "About us" linkTitle: "About us" -weight: 4 +weight: 6 date: 2022-01-09 description: > Who we are, our motivation and policies. diff --git a/content/en/docs/About us/policy.md b/content/en/docs/About us/policy.md index 6104295..3787d29 100644 --- a/content/en/docs/About us/policy.md +++ b/content/en/docs/About us/policy.md @@ -1,7 +1,7 @@ --- title: "Privacy Policy" date: 2023-05-15 -weight: 4 +weight: 5 description: > Our policies and politics. --- diff --git a/content/en/docs/About us/roadmap.md b/content/en/docs/About us/roadmap.md index f4b9923..d43655d 100644 --- a/content/en/docs/About us/roadmap.md +++ b/content/en/docs/About us/roadmap.md @@ -1,7 +1,7 @@ --- title: "Roadmap" linkTitle: "Roadmap" -weight: 5 +weight: 3 date: 2023-10-05 description: > What we are going to do next diff --git a/content/en/docs/About us/team.md b/content/en/docs/About us/team.md index c6da5ff..b13a428 100644 --- a/content/en/docs/About us/team.md +++ b/content/en/docs/About us/team.md @@ -1,7 +1,7 @@ --- title: "Team" date: 2017-01-05T -weight: 3 +weight: 1 description: > Our team, contributors and like-minded people. --- diff --git a/content/en/docs/Backups/_index.md b/content/en/docs/Backups/_index.md index 1f6364d..b2d3762 100644 --- a/content/en/docs/Backups/_index.md +++ b/content/en/docs/Backups/_index.md @@ -2,7 +2,7 @@ title: "Backups" linkTitle: "Backups" date: 2023-07-31T -weight: 2 +weight: 4 description: > Backing up your services so that they are not lost --- diff --git a/content/en/docs/Contributing/_index.md b/content/en/docs/Contributing/_index.md index edb29d7..cc85bec 100644 --- a/content/en/docs/Contributing/_index.md +++ b/content/en/docs/Contributing/_index.md @@ -2,7 +2,7 @@ title: "How to contribute" linkTitle: "Contributing" date: 2023-03-13T -weight: 2 +weight: 7 description: > You can help with translations and programming --- diff --git a/content/en/docs/FAQ/_index.md b/content/en/docs/FAQ/_index.md index f3ad48f..05e8d95 100644 --- a/content/en/docs/FAQ/_index.md +++ b/content/en/docs/FAQ/_index.md @@ -2,7 +2,7 @@ title: "Frequency Asked Questions" linkTitle: "FAQ" date: 2023-03-13T -weight: 2 +weight: 8 description: > Frequently asked questions about our project. --- diff --git a/content/en/docs/Getting started/_index.md b/content/en/docs/Getting started/_index.md index bad55c8..2ff9212 100644 --- a/content/en/docs/Getting started/_index.md +++ b/content/en/docs/Getting started/_index.md @@ -1,7 +1,7 @@ --- title: "Getting Started" linkTitle: "Getting Started" -weight: 1 +weight: 2 description: > How do you deploy and set up SelfPrivacy server? aliases: diff --git a/content/en/docs/How To Guides/_index.md b/content/en/docs/How To Guides/_index.md index d17d45f..f1bee6c 100644 --- a/content/en/docs/How To Guides/_index.md +++ b/content/en/docs/How To Guides/_index.md @@ -1,6 +1,6 @@ --- title: "How-to guides" -weight: 2 +weight: 5 date: 2023-03-14 description: > These are the guides on how to perform common tasks. diff --git a/content/en/docs/Overview/_index.md b/content/en/docs/Overview/_index.md deleted file mode 100644 index 1ad6758..0000000 --- a/content/en/docs/Overview/_index.md +++ /dev/null @@ -1,39 +0,0 @@ ---- -title: "Overview" -linkTitle: "Overview" -weight: 2 -draft: true -description: > - Here's where your user finds out if your project is for them. ---- - -{{% pageinfo %}} -This is a placeholder page that shows you how to use this template site. -{{% /pageinfo %}} - - -The Overview is where your users find out about your project. Depending on the size of your docset, you can have a separate overview page (like this one) or put your overview contents in the Documentation landing page (like in the Docsy User Guide). - -Try answering these questions for your user in this page: - -## What is it? - -Introduce your project, including what it does or lets you do, why you would use it, and its primary goal (and how it achieves it). This should be similar to your README description, though you can go into a little more detail here if you want. - -## Why do I want it? - -Help your user know if your project will help them. Useful information can include: - -* **What is it good for?**: What types of problems does your project solve? What are the benefits of using it? - -* **What is it not good for?**: For example, point out situations that might intuitively seem suited for your project, but aren't for some reason. Also mention known limitations, scaling issues, or anything else that might let your users know if the project is not for them. - -* **What is it *not yet* good for?**: Highlight any useful features that are coming soon. - -## Where should I go next? - -Give your users next steps from the Overview. For example: - -* [Getting Started](/docs/getting-started/): Get started with $project -* [Examples](/docs/examples/): Check out some example code! - diff --git a/content/en/docs/Services/bitwarden.md b/content/en/docs/Services/bitwarden.md index 32d3f43..c19c775 100644 --- a/content/en/docs/Services/bitwarden.md +++ b/content/en/docs/Services/bitwarden.md @@ -1,6 +1,7 @@ --- title: "Bitwarden" date: 2023-01-11T18:09:37+03:00 +weight: 7 description: > Your password manager --- diff --git a/content/en/docs/Services/delta-chat.md b/content/en/docs/Services/delta-chat.md index 0503002..b5a0828 100644 --- a/content/en/docs/Services/delta-chat.md +++ b/content/en/docs/Services/delta-chat.md @@ -1,6 +1,7 @@ --- title: "Delta.Chat" date: 2023-01-11T17:15:31+03:00 +weight: 4 description: > E-mail-based messenger with end-to-end encryption --- diff --git a/content/en/docs/Services/email/_index.md b/content/en/docs/Services/email/_index.md index d267d3c..fe9b106 100644 --- a/content/en/docs/Services/email/_index.md +++ b/content/en/docs/Services/email/_index.md @@ -1,6 +1,7 @@ --- title: "E-mail" date: 2023-01-11T17:10:29+03:00 +weight: 1 description: > Self-hosted e-mail service --- diff --git a/content/en/docs/Services/gitea.md b/content/en/docs/Services/gitea.md index 42049ca..d28e3e0 100644 --- a/content/en/docs/Services/gitea.md +++ b/content/en/docs/Services/gitea.md @@ -1,6 +1,7 @@ --- title: "Gitea" date: 2023-01-11T18:09:12+03:00 +weight: 3 description: > Gitea is a self-hosted Git service --- diff --git a/content/en/docs/Services/jitsi.md b/content/en/docs/Services/jitsi.md index 13b41da..516f616 100644 --- a/content/en/docs/Services/jitsi.md +++ b/content/en/docs/Services/jitsi.md @@ -1,6 +1,7 @@ --- title: "Jitsi" date: 2023-01-11T17:15:31+03:00 +weight: 6 description: > Video conference --- diff --git a/content/en/docs/Services/nextcloud.md b/content/en/docs/Services/nextcloud.md index 1180d2d..8c2be7f 100644 --- a/content/en/docs/Services/nextcloud.md +++ b/content/en/docs/Services/nextcloud.md @@ -1,6 +1,7 @@ --- title: "Nextcloud" date: 2023-01-11T17:08:23+03:00 +weight: 2 description: > Swiss knife in the business of working together --- diff --git a/content/en/docs/Services/pleroma.md b/content/en/docs/Services/pleroma.md index 53c77cc..4d4e7fb 100644 --- a/content/en/docs/Services/pleroma.md +++ b/content/en/docs/Services/pleroma.md @@ -1,6 +1,7 @@ --- title: "Pleroma" date: 2023-01-11T17:17:40+03:00 +weight: 5 description: > Decentralized Social Network Server --- diff --git a/content/en/docs/Theory/_index.md b/content/en/docs/Theory/_index.md index 6116988..a5d6cce 100644 --- a/content/en/docs/Theory/_index.md +++ b/content/en/docs/Theory/_index.md @@ -1,7 +1,7 @@ --- title: "Theory" linkTitle: "Theory" -weight: 5 +weight: 1 date: 2023-05-09 description: > Discussion of various aspects of the project From 294d527e5294abbc8f5a1777e141c274245bdcb2 Mon Sep 17 00:00:00 2001 From: nevfy Date: Mon, 8 Apr 2024 05:21:10 +0300 Subject: [PATCH 3/5] fix(ru): reorder toc --- content/ru/docs/About us/_index.md | 4 +-- content/ru/docs/About us/policy.md | 2 +- content/ru/docs/About us/team.md | 2 +- content/ru/docs/Backups/_index.md | 2 +- content/ru/docs/Contributing/_index.md | 2 +- content/ru/docs/FAQ/_index.md | 2 +- content/ru/docs/Getting started/_index.md | 2 +- content/ru/docs/How To Guides/_index.md | 2 +- content/ru/docs/Overview/_index.md | 39 ----------------------- content/ru/docs/Services/_index.md | 2 +- content/ru/docs/Services/bitwarden.md | 1 + content/ru/docs/Services/delta-chat.md | 1 + content/ru/docs/Services/email/_index.md | 1 + content/ru/docs/Services/gitea.md | 1 + content/ru/docs/Services/jitsi.md | 1 + content/ru/docs/Services/nextcloud.md | 1 + content/ru/docs/Services/pleroma.md | 1 + content/ru/docs/Theory/_index.md | 2 +- 18 files changed, 18 insertions(+), 50 deletions(-) delete mode 100644 content/ru/docs/Overview/_index.md diff --git a/content/ru/docs/About us/_index.md b/content/ru/docs/About us/_index.md index a18f85b..59a747f 100644 --- a/content/ru/docs/About us/_index.md +++ b/content/ru/docs/About us/_index.md @@ -1,8 +1,8 @@ --- title: "О нас" linkTitle: "О нас" -weight: 4 +weight: 5 date: 2022-01-09 description: > - Кто мы такие, в чем наша мотивая и какова наша политика + Кто мы такие, в чем наша мотивация и какова наша политика --- diff --git a/content/ru/docs/About us/policy.md b/content/ru/docs/About us/policy.md index 2281652..7468129 100644 --- a/content/ru/docs/About us/policy.md +++ b/content/ru/docs/About us/policy.md @@ -1,7 +1,7 @@ --- title: "Политика" date: 2023-04-23 -weight: 4 +weight: 5 description: > Наши принципы и политика --- diff --git a/content/ru/docs/About us/team.md b/content/ru/docs/About us/team.md index 9f48dee..957f05c 100644 --- a/content/ru/docs/About us/team.md +++ b/content/ru/docs/About us/team.md @@ -1,7 +1,7 @@ --- title: "Команда" date: 2017-01-05T -weight: 3 +weight: 1 description: > Наша команда, вкладчики и единомышленники. --- diff --git a/content/ru/docs/Backups/_index.md b/content/ru/docs/Backups/_index.md index 69658ad..b07ad18 100644 --- a/content/ru/docs/Backups/_index.md +++ b/content/ru/docs/Backups/_index.md @@ -2,7 +2,7 @@ title: "Резервное копирование" linkTitle: "Резервное копирование" date: 2023-07-31T -weight: 2 +weight: 3 description: > Резервное копирование сервисов, чтобы данные никогда не были потеряны --- diff --git a/content/ru/docs/Contributing/_index.md b/content/ru/docs/Contributing/_index.md index f99de40..21b83c3 100644 --- a/content/ru/docs/Contributing/_index.md +++ b/content/ru/docs/Contributing/_index.md @@ -2,7 +2,7 @@ title: "Как помочь проекту?" linkTitle: "Как помочь проекту" date: 2023-03-13 -weight: 2 +weight: 6 description: > Вы можете помочь как с переводом на разные языки, так и своими знаниями программирования --- diff --git a/content/ru/docs/FAQ/_index.md b/content/ru/docs/FAQ/_index.md index ab79f2c..454f604 100644 --- a/content/ru/docs/FAQ/_index.md +++ b/content/ru/docs/FAQ/_index.md @@ -2,7 +2,7 @@ title: "Часто задаваемые вопросы" linkTitle: "ЧаВо" date: 2023-03-13T -weight: 2 +weight: 7 description: > Частые вопросы о проекте --- diff --git a/content/ru/docs/Getting started/_index.md b/content/ru/docs/Getting started/_index.md index 277fe66..c33d40c 100644 --- a/content/ru/docs/Getting started/_index.md +++ b/content/ru/docs/Getting started/_index.md @@ -1,7 +1,7 @@ --- title: "Начало работы" linkTitle: "Начало работы" -weight: 1 +weight: 2 description: > Как установить и настроить сервер SelfPrivacy? --- diff --git a/content/ru/docs/How To Guides/_index.md b/content/ru/docs/How To Guides/_index.md index e1d48c5..b084c0a 100644 --- a/content/ru/docs/How To Guides/_index.md +++ b/content/ru/docs/How To Guides/_index.md @@ -1,6 +1,6 @@ --- title: "Инструкции" -weight: 2 +weight: 4 date: 2023-03-14 description: > Руководства, которые могут пригодиться. diff --git a/content/ru/docs/Overview/_index.md b/content/ru/docs/Overview/_index.md deleted file mode 100644 index 1ad6758..0000000 --- a/content/ru/docs/Overview/_index.md +++ /dev/null @@ -1,39 +0,0 @@ ---- -title: "Overview" -linkTitle: "Overview" -weight: 2 -draft: true -description: > - Here's where your user finds out if your project is for them. ---- - -{{% pageinfo %}} -This is a placeholder page that shows you how to use this template site. -{{% /pageinfo %}} - - -The Overview is where your users find out about your project. Depending on the size of your docset, you can have a separate overview page (like this one) or put your overview contents in the Documentation landing page (like in the Docsy User Guide). - -Try answering these questions for your user in this page: - -## What is it? - -Introduce your project, including what it does or lets you do, why you would use it, and its primary goal (and how it achieves it). This should be similar to your README description, though you can go into a little more detail here if you want. - -## Why do I want it? - -Help your user know if your project will help them. Useful information can include: - -* **What is it good for?**: What types of problems does your project solve? What are the benefits of using it? - -* **What is it not good for?**: For example, point out situations that might intuitively seem suited for your project, but aren't for some reason. Also mention known limitations, scaling issues, or anything else that might let your users know if the project is not for them. - -* **What is it *not yet* good for?**: Highlight any useful features that are coming soon. - -## Where should I go next? - -Give your users next steps from the Overview. For example: - -* [Getting Started](/docs/getting-started/): Get started with $project -* [Examples](/docs/examples/): Check out some example code! - diff --git a/content/ru/docs/Services/_index.md b/content/ru/docs/Services/_index.md index 4700bb4..60143df 100644 --- a/content/ru/docs/Services/_index.md +++ b/content/ru/docs/Services/_index.md @@ -1,7 +1,7 @@ --- title: "Доступные сервисы" linkTitle: "Сервисы" -weight: 3 +weight: 2 date: 2022-01-09 description: > О сервисах, которые мы используем diff --git a/content/ru/docs/Services/bitwarden.md b/content/ru/docs/Services/bitwarden.md index f1c2f39..3d6fc94 100644 --- a/content/ru/docs/Services/bitwarden.md +++ b/content/ru/docs/Services/bitwarden.md @@ -1,6 +1,7 @@ --- title: "Bitwarden" date: 2023-01-11T18:09:37+03:00 +weigth: 7 description: > Ваш менеджер паролей --- diff --git a/content/ru/docs/Services/delta-chat.md b/content/ru/docs/Services/delta-chat.md index 9abdaab..4d5f657 100644 --- a/content/ru/docs/Services/delta-chat.md +++ b/content/ru/docs/Services/delta-chat.md @@ -1,6 +1,7 @@ --- title: "Delta.Chat" date: 2023-01-11T17:15:31+03:00 +weight: 4 description: > Мессенджер на базе E-mail со сквозным шифрованием --- diff --git a/content/ru/docs/Services/email/_index.md b/content/ru/docs/Services/email/_index.md index b749f95..5b4a44c 100644 --- a/content/ru/docs/Services/email/_index.md +++ b/content/ru/docs/Services/email/_index.md @@ -1,6 +1,7 @@ --- title: "E-mail" date: 2023-01-11T17:10:29+03:00 +weight: 1 description: > Свой почтовый сервер --- diff --git a/content/ru/docs/Services/gitea.md b/content/ru/docs/Services/gitea.md index d39958d..05360ed 100644 --- a/content/ru/docs/Services/gitea.md +++ b/content/ru/docs/Services/gitea.md @@ -1,6 +1,7 @@ --- title: "Gitea" date: 2023-01-11T18:09:12+03:00 +weight: 3 description: > Личный git-сервис --- diff --git a/content/ru/docs/Services/jitsi.md b/content/ru/docs/Services/jitsi.md index 5ee6962..d8259a5 100644 --- a/content/ru/docs/Services/jitsi.md +++ b/content/ru/docs/Services/jitsi.md @@ -1,6 +1,7 @@ --- title: "Jitsi" date: 2023-01-11T17:15:31+03:00 +weight: 6 description: > Видеоконференции --- diff --git a/content/ru/docs/Services/nextcloud.md b/content/ru/docs/Services/nextcloud.md index 5ad14d6..5eae4da 100644 --- a/content/ru/docs/Services/nextcloud.md +++ b/content/ru/docs/Services/nextcloud.md @@ -1,6 +1,7 @@ --- title: "Nextcloud" date: 2023-01-11T17:08:23+03:00 +weight: 2 description: > Швейцарский нож в деле совместной работы --- diff --git a/content/ru/docs/Services/pleroma.md b/content/ru/docs/Services/pleroma.md index e4305bf..a1227c1 100644 --- a/content/ru/docs/Services/pleroma.md +++ b/content/ru/docs/Services/pleroma.md @@ -1,6 +1,7 @@ --- title: "Pleroma" date: 2023-01-11T17:17:40+03:00 +weight: 5 description: > Сервер децентрализованной социальной сети --- diff --git a/content/ru/docs/Theory/_index.md b/content/ru/docs/Theory/_index.md index f12f5f4..89f924a 100644 --- a/content/ru/docs/Theory/_index.md +++ b/content/ru/docs/Theory/_index.md @@ -1,7 +1,7 @@ --- title: "Теория" linkTitle: "Теория" -weight: 5 +weight: 1 date: 2023-05-09 description: > Обсуждение различных аспектов проекта From 19a0b0f0ca747b262018188659a2b51863c5281a Mon Sep 17 00:00:00 2001 From: Inex Code Date: Wed, 17 Apr 2024 16:31:55 +0300 Subject: [PATCH 4/5] fix: relrefs with spaces --- content/ru/_index.html | 4 ++-- content/ru/download/_index.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/ru/_index.html b/content/ru/_index.html index a71657c..902d7cf 100644 --- a/content/ru/_index.html +++ b/content/ru/_index.html @@ -40,7 +40,7 @@ linkTitle = "SelfPrivacy"
Седьмой слайд
- + @@ -61,7 +61,7 @@ linkTitle = "SelfPrivacy" Приложение SelfPrivacy поможет настроить селфхост-сервисы и управлять ими }}"> + href="{{< relref "/download">}}"> Скачать diff --git a/content/ru/download/_index.html b/content/ru/download/_index.html index 590d4e7..17c2a0f 100644 --- a/content/ru/download/_index.html +++ b/content/ru/download/_index.html @@ -100,9 +100,9 @@ title: Скачать {{< landing-feature book "Что делать дальше то?" "right">}} }}"> + href="{{< relref "/docs/Getting started/">}}"> Гайд по установке {{< /landing-feature>}} - {{< /blocks/section>}} \ No newline at end of file + {{< /blocks/section>}} From f5b80082ed3720f652a86df8b278c2593d134434 Mon Sep 17 00:00:00 2001 From: nevfy Date: Thu, 18 Apr 2024 21:41:36 +0300 Subject: [PATCH 5/5] Update layout (#102) This merge request solves following issues with the current layout: - **h1 header not instantly visible on the first screen on mobile:** changed the order so it appears before the screenshot gallery - **alternation of text and images looking weird in vertical mobile layout:** removed the alternation on mobile - **services and advantages being spread too wide on desktop:** added space on the sides - **advantages having repetitive layout, supporters repeating the look of services:** added variety with sliding effect and alternating background color, removed card-like background Reviewed-on: https://git.selfprivacy.org/SelfPrivacy/selfprivacy.org/pulls/102 Reviewed-by: Inex Code Co-authored-by: nevfy Co-committed-by: nevfy --- assets/scss/_styles_project.scss | 61 ++++++++++++----- assets/scss/docsy_overrides.scss | 5 ++ content/en/_index.html | 63 +++++++++-------- content/ru/_index.html | 89 ++++++++++++------------- layouts/shortcodes/landing-feature.html | 20 +++--- package.json | 2 +- 6 files changed, 136 insertions(+), 104 deletions(-) diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index 2c7602d..84c0d5f 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -23,7 +23,6 @@ .sp-footer span i { margin: auto; } - .rounded-img { border-radius: 1rem; } @@ -91,28 +90,18 @@ margin-top: 6rem; } -.sp-supperted-by-img { - max-height: 5rem; +.sp-supported-by-img { + max-width: 15rem; margin: 1rem; } .sp-supported-by-list { display: flex; align-items: center; - justify-content: space-around; + justify-content: center; + column-gap: 5vw; flex-wrap: wrap; -} - -.sp-supported-by-card { - background: white; - box-shadow: $shadow; - border-radius: 10px; - border: none; - margin-top: 1rem; -} - -body { - background-color: $bg-color; + margin-top: 2rem; } a.nav-link.sp-coming-soon { @@ -129,3 +118,43 @@ a.nav-link.sp-coming-soon { border-radius: .1rem; } } + +html, body { + max-width: 100%; + overflow-x: hidden; +} + +body { + background-color: $bg-color; +} + +.sp-advantages { + row-gap: 0px; +} + +.sp-advantages-header { + position: sticky; + top: 10vh; + margin-bottom: 5rem; +} + +.sp-feature { + position: sticky; + top: 0; + min-height: 100vh; +} + +.sp-feature-green { + background-color: #e9f1da !important; +} +.sp-feature-blue { + background-color: #e1eaea !important; +} +.sp-feature-purple { + background-color: #ebe0e8 !important; +} + +.container-fluid { + padding-left: 0 !important; + padding-right: 0 !important; +} \ No newline at end of file diff --git a/assets/scss/docsy_overrides.scss b/assets/scss/docsy_overrides.scss index 02a2e28..34ea411 100644 --- a/assets/scss/docsy_overrides.scss +++ b/assets/scss/docsy_overrides.scss @@ -1,6 +1,7 @@ .td-navbar { background: $dark; min-height: 5rem; + z-index: 15; .navbar-brand__name { display: none; } @@ -192,4 +193,8 @@ li:has(input[type="checkbox"]) { .td-sidebar-toc { padding-top: 2.75rem; } +} + +.carousel-control-next, .carousel-control-prev { + background-image: none; } \ No newline at end of file diff --git a/content/en/_index.html b/content/en/_index.html index c88d2ed..1f03327 100644 --- a/content/en/_index.html +++ b/content/en/_index.html @@ -5,19 +5,10 @@ linkTitle = "SelfPrivacy" +++ {{< blocks/section color="dark" type="section" >}} -
+
-
+

SelfPrivacy app allows you to set up self-hosted services and manage them @@ -65,12 +65,12 @@ linkTitle = "SelfPrivacy"

{{< /blocks/section >}} -
-
+
+

Your personal services

-
+

For serious business

@@ -94,7 +94,7 @@ linkTitle = "SelfPrivacy"
-
+

For entertainment and communication

@@ -118,8 +118,7 @@ linkTitle = "SelfPrivacy"
- -
+

For a good life

@@ -139,47 +138,47 @@ linkTitle = "SelfPrivacy"
-
-
+
+

Advantages

- {{< landing-feature privacy "Privacy" >}} + {{< landing-feature privacy "Privacy" "-green" >}}

No registration, cookies or telemetry.

{{< /landing-feature >}} - {{< landing-feature zerotrust "Zero trust" "right">}} + {{< landing-feature zerotrust "Zero trust" "-blue" "right" >}}

SelfPrivacy is developed on the «zero trust» principle, even in relation to SelfPrivacy developers. That means you're the sole owner of your data.

{{< /landing-feature >}} - {{< landing-feature security "Security">}} + {{< landing-feature security "Security" "-purple" >}}

Open source. The $2,000 reward for RCE vulnerability significantly increases security compared to conventional self-hosted solutions.

{{< /landing-feature >}} - {{< landing-feature simplicity "Simplicity" "right">}} + {{< landing-feature simplicity "Simplicity" "-green" "right">}}

It is simple. Without console, complicated instructions, monitoring and involvement of specialists.

{{< /landing-feature >}} - {{< landing-feature arrow "No license agreements">}} + {{< landing-feature arrow "No license agreements" "-blue" >}}

What is written in the license agreements that you accept without reading? It says that you allow companies to do anything with your data. SelfPrivacy has no license agreements.

{{< /landing-feature >}} - {{< landing-feature coolhack3r "Save your time and money" "right">}} + {{< landing-feature coolhack3r "Save your time and money" "-purple" "right">}}

How to save $500 or two weeks of your life? Will it take the same time and money for a specialist to set everything up from scratch?

SelfPrivacy team works continuously to speed up and simplify this process to a few clicks.

Now anyone will be capable to set up their own data center.

{{< /landing-feature >}} - {{< landing-feature thisisfine "Functionality">}} + {{< landing-feature thisisfine "Functionality" "-green">}}

Your data will not be lost thanks to regular automatic backups to a separate data center.

{{< /landing-feature >}} - {{< landing-feature smartphonecomparison "Independence" "right">}} + {{< landing-feature smartphonecomparison "Independence" "-blue" "right">}}

Your communications on the internet no longer depend on Google, Facebook, Amazon and others E-Corps.

Your services, your rules! You will not be blocked or disabled, accidentally or for any other reason. Your infrastructure and data will always remain with you.

{{< /landing-feature >}} - {{< landing-feature datactrl "Data control">}} + {{< landing-feature datactrl "Data control" "-purple" >}}

Why do corporations need your data? To make you buy more and vote as they want. With SelfPrivacy, only you have your data.

{{< /landing-feature >}}
@@ -190,13 +189,13 @@ linkTitle = "SelfPrivacy"

Supported by

-
-
+
+
- NLnet foundation + NLnet foundation - Privacy Accelerator + Privacy Accelerator
diff --git a/content/ru/_index.html b/content/ru/_index.html index 902d7cf..d1762a8 100644 --- a/content/ru/_index.html +++ b/content/ru/_index.html @@ -5,19 +5,10 @@ linkTitle = "SelfPrivacy" +++ {{< blocks/section color="dark" type="section">}} -
+
-
+

Приложение SelfPrivacy поможет настроить селфхост-сервисы и управлять ими

}}"> + href="{{< relref "/download" >}}"> Скачать
@@ -69,12 +68,12 @@ linkTitle = "SelfPrivacy"
{{< /blocks/section>}} -
-
-

Ваши личные сервисы

+
+
+

Ваши личные сервисы

-
+

Для серьезных дел

@@ -99,7 +98,7 @@ linkTitle = "SelfPrivacy"
-
+

Для развлечений и общения

@@ -107,38 +106,36 @@ linkTitle = "SelfPrivacy"
{{< landing-service "/images/services/deltachat.svg" "Мессенджер" >}}

Самый приватный мессенджер — это тот, у которого серверная часть находится - под вашим контролем. Это делает DeltaChat - приватнее Telegram и Signal.

- {{< /landing-service>}} + под вашим контролем. Это делает DeltaChat + приватнее Telegram и Signal.

+ {{< /landing-service>}}
{{< landing-service "/images/services/pleroma.svg" "Децентрализованная социальная сеть" >}}

Pleroma — социальная сеть в которой вы решаете, кого заблокировать и что - публиковать. Никакой больше рекламы и слежки.

- {{< /landing-service>}} + публиковать. Никакой больше рекламы и слежки.

+ {{< /landing-service>}}
{{< landing-service "/images/services/jitsi.svg" "Видеоконференция">}}

Zoom и Google-meet больше не нужны, когда есть Jitsi-meet. Очень простое и - удобное решение для видеоконференций.

- {{< /landing-service>}} + удобное решение для видеоконференций.

+ {{< /landing-service>}}
-
+

Для хорошей жизни

{{< landing-service "/images/services/openconnect.svg" "VPN для друзей и близких" >}} -

Ни один публичный VPN не может быть приватным, если только он не расположен на вашем сервере. - OpenConnect — подключайте - неограниченное количество устройств.

- {{< /landing-service>}} +

Ни один публичный VPN не может быть приватным, если только он не расположен на вашем сервере. OpenConnect — подключайте неограниченное количество устройств.

+ {{< /landing-service>}}
@@ -146,69 +143,69 @@ linkTitle = "SelfPrivacy"

Пароли больше не нужно запоминать, копировать между устройствами, придумывать или вводить вручную.

Bitwarden — надежный менеджер паролей для всех устройств.

- {{< /landing-service>}} + {{< /landing-service>}}
-
+

Преимущества

- {{< landing-feature privacy "Приватность">}} + {{< landing-feature privacy "Приватность" "-green">}}

Без регистрации, куков, телеметрии, логов, гугл аналитики и облаков.

{{< /landing-feature>}} - {{< landing-feature zerotrust "Нулевое доверие" "right">}} + {{< landing-feature zerotrust "Нулевое доверие" "-blue" "right">}}

SelfPrivacy разработан по принципу "нулевого доверия", даже к самим разработчикам SelfPrivacy. Это значит, что вы — единственный владелец своих данных.

{{< /landing-feature>}} - {{< landing-feature security "Безопасность">}} + {{< landing-feature security "Безопасность" "-purple" >}}

Открытый код. Вознаграждение $2000 за RCE-уязвимость значительно повышает безопасность в сравнении с обычными self-hosted решениями.

{{< /landing-feature>}} - {{< landing-feature simplicity "Простота" "right">}} + {{< landing-feature simplicity "Простота" "-green" "right">}}

Это работает просто. Без консоли, сложных инструкций, мониторинга и привлечения специалистов.

{{< /landing-feature>}} - {{< landing-feature arrow "Без лицензионных соглашений">}} + {{< landing-feature arrow "Без лицензионных соглашений" "-blue" >}}

Что написано в лицензионных соглашениях, которые вы принимаете, не читая? Там написано, что с вашими данными можно делать что угодно. В SelfPrivacy нет лицензионных соглашений.

{{< /landing-feature>}} - {{< landing-feature coolhack3r "Экономия времени, денег и сил" "right">}} + {{< landing-feature coolhack3r "Экономия времени, денег и сил" "-purple" "right">}}

Как сэкономить $500 или две недели жизни? Столько понадобится времени и денег специалисту, чтобы настроить все самому с нуля?

Команда SelfPrivacy непрерывно работает, чтобы ускорить и упростить этот процесс до нескольких кликов.

Теперь создание личного дата-центра под силу любому желающему.

{{< /landing-feature>}} - {{< landing-feature thisisfine "Функционал">}} + {{< landing-feature thisisfine "Функционал" "-green">}}

Ваши данные никуда не пропадут благодаря регулярному автоматическому резервному копированию в отдельный дата-центр.

{{< /landing-feature>}} - {{< landing-feature smartphonecomparison "Независимость" "right" >}} + {{< landing-feature smartphonecomparison "Независимость" "-blue" "right" >}}

Ваши коммуникации в интернете не зависят от Google, Facebook, Amazon и прочих мегакорпораций.

Ваши сервисы — ваши правила! Вас не заблокируют, не отключат, случайно или по какой-либо другой причине. Ваша инфраструктура и данные всегда останутся с вами.

{{< /landing-feature>}} - {{< landing-feature datactrl "Контроль данных">}} + {{< landing-feature datactrl "Контроль данных" "-purple" >}}

Почему корпорациям так нужны ваши данные? Чтобы больше покупали, чтобы Вы голосовали, как им нужно. В SelfPrivacy ваши данные остаются только у вас.

{{< /landing-feature>}}
-
+

Нас поддерживают

-
-
+
+
- NLnet foundation + NLnet foundation - Privacy Accelerator + Privacy Accelerator
diff --git a/layouts/shortcodes/landing-feature.html b/layouts/shortcodes/landing-feature.html index e582cb8..a36baa7 100644 --- a/layouts/shortcodes/landing-feature.html +++ b/layouts/shortcodes/landing-feature.html @@ -1,26 +1,28 @@ {{ $illustration := .Page.Resources.GetMatch (printf "**%s*" (.Get 0)) }} {{ $title := .Get 1 }} -{{ $side := .Get 2 }} -
- {{ if eq $side "right" }} -
+{{ $bg := .Get 2 }} +{{ $side := .Get 3 }} +{{ if eq $side "right" }} +
+
{{ if $title }}

{{ $title }}

{{ end }} {{ .Inner }}
{{ if $illustration }} -
- +
+
{{ end }} {{ else }} +
{{ if $illustration }} -
- +
+
{{ end }} -
+
{{ if $title }}

{{ $title }}

{{ end }} diff --git a/package.json b/package.json index 960eee9..d3409ef 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,6 @@ "devDependencies": { "autoprefixer": "^10.4.0", "postcss": "^8.3.7", - "postcss-cli": "^9.0.2" + "postcss-cli": "^9.1.0" } }