Merge remote-tracking branch 'upstream/master' into docs-bread

This commit is contained in:
nevfy 2024-01-30 19:54:31 +04:00
commit 07ec6cc0e3
7 changed files with 102 additions and 35 deletions

View file

@ -5,15 +5,76 @@
display: none;
}
.nav-link {
color: $secondary !important;
font-weight: 600;
}
.nav-link:hover, .nav-link.active{
background-color: #616161;
color: white;
border-radius: 5px;
}
}
.td-breadcrumbs__single {
visibility: hidden;
}
.td-toc ul {
.td-navbar .td-navbar-nav-scroll {
height: unset !important;
margin-top: unset !important;
}
.td-navbar .td-navbar-nav-scroll .nav-link {
padding: .5rem 1.5rem;
}
.sp-footer a.nav-link span {
width: 2rem;
display: inline-flex;
align-items: center;
border-radius: .1rem;
padding: .5rem;
}
.sp-footer span i {
margin: auto;
}
.td-navbar .td-navbar-nav-scroll .navbar-nav {
padding-bottom: 0 !important;
}
.nav-item {
margin-right: .5rem !important;
}
.dropdown-menu {
right: 0;
left: unset;
padding: 0px;
box-shadow: 0 8px 8px rgba(0, 0, 0, 0.25);
}
.dropdown-item {
padding: 0.5rem 1.5rem;
border-radius: 0.25rem;
}
.td-sidebar-nav .td-sidebar-link__page,
ul.ul-2>.td-sidebar-nav__section-title a {
color: #616161 !important;
font-weight: 400;
}
ul.ul-2>.td-sidebar-nav__section-title a:hover {
color: $blue !important;
}
li:has(input[type="checkbox"]) {
list-style-type: none;
}
.td-toc ul {
margin-top: 1rem;
}
@ -42,6 +103,10 @@
border-radius: 1rem;
}
.card-title {
font-weight: 600;
}
.sp-button-shadow {
box-shadow: 0px -0.5rem 0px 0px rgba(0, 0, 0, 0.1) inset;
}
@ -79,6 +144,10 @@
}
}
.text-secondary {
font-weight: 600;
}
.sp-service-icon {
margin-top: -4rem;
max-width: 12rem;
@ -122,6 +191,10 @@
margin-top: 1rem;
}
body {
background-color: whitesmoke;
}
a.nav-link.sp-coming-soon {
pointer-events: none;
cursor: default;
@ -130,9 +203,10 @@ a.nav-link.sp-coming-soon {
a.nav-link.sp-coming-soon::after {
content: "Coming soon!";
display: inline-block;
background-color: #616161;
color: $dark;
margin-left: .5rem;
padding: .1rem;
padding: .1rem .5rem;
border-radius: .1rem;
}

View file

@ -47,7 +47,7 @@ linkTitle = "SelfPrivacy"
<div class="col-xs-12 col-md-8 my-auto">
<div class="container my-4">
<h1>
SelfPrivacy app allows you to set up self-hosted services and manage them.
SelfPrivacy app allows you to set up self-hosted services and manage them
</h1>
<a class="btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding" href="{{< relref "/download" >}}">
Download
@ -57,9 +57,9 @@ linkTitle = "SelfPrivacy"
</div>
{{< /blocks/section >}}
{{< blocks/section color="100" type="section" >}}
<section class="container-fluid">
<div class="row w-100">
<h2 class="mx-auto text-center">Your personal services</h2>
<h2 class="mx-auto text-center font-weight-bolder">Your personal services</h2>
</div>
<div class="row w-100 mt-5 mb-3">
@ -129,9 +129,9 @@ linkTitle = "SelfPrivacy"
{{< /landing-service >}}
</div>
</div>
{{< /blocks/section >}}
</section>
{{< blocks/section color="100" type="section" >}}
<section class="container-fluid">
<div class="row w-100">
<h2 class="mx-auto text-center">Advantages</h2>
</div>
@ -174,12 +174,10 @@ linkTitle = "SelfPrivacy"
{{< landing-feature datactrl "Data control">}}
<p class="card-text">Why do corporations need your data? To make you buy more and vote as they want. With SelfPrivacy, only you have your data.</p>
{{< /landing-feature >}}
{{< /blocks/section >}}
</section>
{{< blocks/section color="100" type="section" >}}
<section class="container-fluid">
<div class="row w-100">
<h2 class="mx-auto text-center">Supported by</h2>
</div>
@ -194,5 +192,4 @@ linkTitle = "SelfPrivacy"
</a>
</div>
</div>
{{< /blocks/section >}}
</section>

View file

@ -60,7 +60,7 @@ linkTitle = "SelfPrivacy"
</div>
{{< /blocks/section>}}
{{< blocks/section color="100" type="section">}}
<section class="container-fluid">
<div class="row w-100">
<h2 class="mx-auto text-center">Ваши личные сервисы</h2>
</div>
@ -140,9 +140,9 @@ linkTitle = "SelfPrivacy"
{{< /landing-service>}}
</div>
</div>
{{< /blocks/section>}}
</section>
{{< blocks/section color="100" type="section">}}
<section class="container-fluid">
<div class="row w-100">
<h2 class="mx-auto text-center">Преимущества</h2>
</div>
@ -185,12 +185,10 @@ linkTitle = "SelfPrivacy"
{{< landing-feature datactrl "Контроль данных">}}
<p class="card-text">Почему корпорациям так нужны ваши данные? Чтобы больше покупали, чтобы Вы голосовали, как им нужно. В SelfPrivacy ваши данные остаются только у вас.</p>
{{< /landing-feature>}}
{{< /blocks/section>}}
</section>
{{< blocks/section color="100" type="section" >}}
<section class="container-fluid">
<div class="row w-100">
<h2 class="mx-auto text-center">Нас поддерживают</h2>
</div>
@ -205,5 +203,4 @@ linkTitle = "SelfPrivacy"
</a>
</div>
</div>
{{< /blocks/section >}}
</section>

View file

@ -1,6 +1,6 @@
---
title: "SelfPrivacy Blog"
linkTitle: "Blog"
title: "Блог SelfPrivacy"
linkTitle: "Блог"
menu:
main:
weight: 30
@ -10,4 +10,3 @@ menu:
This is the **blog** section. It has two categories: News and Releases.
Files in these directories will be listed in reverse chronological order.

View file

@ -44,16 +44,16 @@
<h2 class="text-secondary">{{ T "footer_download" }}</h2>
<h3 class="text-secondary">{{ T "footer_download_phone" }}</h3>
<ul class="list-unstyled">
<li><a href="https://fdroid.selfprivacy.org/" class="nav-link" rel="noopener noreferrer" target="_blank">{{ T "footer_download_fdroid" }}</a></li>
<li><a href="https://play.google.com/store/apps/details?id=org.selfprivacy.app" class="nav-link" rel="noopener noreferrer" target="_blank">{{ T "footer_download_google_play" }}</a></li>
<li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link" rel="noopener noreferrer" target="_blank">{{ T "footer_download_apk" }}</a></li>
<li><a href="#" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank">{{ T "footer_download_ios" }}</a></li>
<li><a href="https://fdroid.selfprivacy.org/" class="nav-link" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-android"></i></span> {{ T "footer_download_fdroid" }}</a></li>
<li><a href="https://play.google.com/store/apps/details?id=org.selfprivacy.app" class="nav-link" rel="noopener noreferrer" target="_blank"><span><i class="fa-solid fa-play"></i></span> {{ T "footer_download_google_play" }}</a></li>
<li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link" rel="noopener noreferrer" target="_blank"><span><i class="fa-solid fa-file"></i></span> {{ T "footer_download_apk" }}</a></li>
<li><a href="#" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-apple"></i></span> {{ T "footer_download_ios" }}</a></li>
</ul>
<h3 class="text-secondary">{{ T "footer_download_desktop" }}</h3>
<ul class="list-unstyled">
<li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link" rel="noopener noreferrer" target="_blank">{{ T "footer_download_linux" }}</a></li>
<li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank">{{ T "footer_download_windows" }}</a></li>
<li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank">{{ T "footer_download_macos" }}</a></li>
<li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-linux"></i></span> {{ T "footer_download_linux" }}</a></li>
<li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-windows"></i></span> {{ T "footer_download_windows" }}</a></li>
<li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-apple"></i></span> {{ T "footer_download_macos" }}</a></li>
</ul>
</div>

View file

@ -11,13 +11,13 @@
</div>
{{ if $illustration }}
<div class="col-md-4 col-xs-12 my-auto">
<img class="card-img-top rounded-img" src="{{ $illustration.RelPermalink }}">
<img class="card-img-top rounded-img" src="{{ $illustration.RelPermalink }}" alt="">
</div>
{{ end }}
{{ else }}
{{ if $illustration }}
<div class="col-md-4 col-xs-12 my-auto">
<img class="card-img-top rounded-img" src="{{ $illustration.RelPermalink }}">
<img class="card-img-top rounded-img" src="{{ $illustration.RelPermalink }}" alt="">
</div>
{{ end }}
<div class="col-md-8 col-xs-12 my-auto px-5">

View file

@ -1,7 +1,7 @@
{{ $illustration := .Get 0 }}
{{ $title := .Get 1 }}
<div class="card sp-service-card h-100">
<img class="card-img-top rounded-img sp-service-icon" src="{{ $illustration }}" alt="{{ $title }}">
<img class="card-img-top rounded-img sp-service-icon" src="{{ $illustration }}" alt="">
<div class="card-body">
<h4 class="card-title">{{ $title }}</h4>
{{ .Inner }}