Merge branch 'master' into theme-clone

assets/scss/_styles_project.scss

@@ -119,7 +119,7 @@ a.nav-link.sp-coming-soon {
   }
 }
 
-html, body {
+html {
   max-width: 100%;
   overflow-x: hidden;
 }
@@ -128,6 +128,10 @@ body {
   background-color: $bg-color;
 }
 
+a, a.btn-link {
+  text-decoration: none;
+}
+
 .sp-advantages {
   row-gap: 0px;
 }

content/en/_index.html

@@ -8,7 +8,7 @@ linkTitle = "SelfPrivacy"
 	<div class="flex-md-row flex-column-reverse d-flex justify-content-center align-content-center">
 		<div class="col-xs-12 col-md-4">
 			<div class="container rounded">
-				<div id="screenshotsCarouselControls" class="carousel slide" data-ride="carousel">
+				<div id="screenshotsCarouselControls" class="carousel slide" data-bs-ride="carousel">
 				  <div class="carousel-inner rounded">
 					<div class="carousel-item">
 					  <img class="d-block w-100" src="/images/screenshots/1-en.png" alt="First slide">
@@ -33,22 +33,22 @@ linkTitle = "SelfPrivacy"
 					</div>
 				  </div>
 				  <ol class="carousel-indicators">
-					<li data-target="#screenshotsCarouselControls" data-slide-to="0" class="active"></li>
-					<li data-target="#screenshotsCarouselControls" data-slide-to="1"></li>
-					<li data-target="#screenshotsCarouselControls" data-slide-to="2"></li>
-					<li data-target="#screenshotsCarouselControls" data-slide-to="3"></li>
-					<li data-target="#screenshotsCarouselControls" data-slide-to="4"></li>
-					<li data-target="#screenshotsCarouselControls" data-slide-to="5"></li>
-					<li data-target="#screenshotsCarouselControls" data-slide-to="6"></li>
+					<li data-bs-target="#screenshotsCarouselControls" data-slide-to="0" class="active"></li>
+					<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="1"></li>
+					<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="2"></li>
+					<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="3"></li>
+					<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="4"></li>
+					<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="5"></li>
+					<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="6"></li>
 				  </ol>
-				  <a class="carousel-control-prev" href="#screenshotsCarouselControls" role="button" data-slide="prev">
+				  <button class="carousel-control-prev" type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide="prev">
 					<span class="carousel-control-prev-icon" aria-hidden="true"></span>
-					<span class="sr-only">Previous</span>
-				  </a>
-				  <a class="carousel-control-next" href="#screenshotsCarouselControls" role="button" data-slide="next">
+					<span class="visually-hidden">Previous</span>
+				  </button>
+				  <button class="carousel-control-next" type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide="next">
 					<span class="carousel-control-next-icon" aria-hidden="true"></span>
-					<span class="sr-only">Next</span>
-				  </a>
+					<span class="visually-hidden">Next</span>
+				  </button>	
 				  </div>
 			</div>
  		</div>

content/en/download/_index.html

@@ -2,8 +2,6 @@
 title: Downloads
 ---
 
-<!--add blocks of content here to add more sections to the community page -->
-
 {{< blocks/lead >}}
 	<div class="row w-100 my-4">
 		<h1 class="mx-auto text-center w-100">Downloads</h1>
@@ -12,7 +10,6 @@ title: Downloads
 	<p>
 		Get the latest version of SelfPrivacy app for your operating system.
 	</p>
-
 {{< /blocks/lead >}}
 
 {{< blocks/section color="white" type="section" >}}
@@ -23,26 +20,25 @@ title: Downloads
 
 	<div class="row w-100">
 		<div class="col-md-4">
-			<a class="btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding" href="https://f-droid.org/en/packages/pro.kherel.selfprivacy/" rel="noopener noreferrer" target="_blank">
+			<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding" href="https://f-droid.org/en/packages/pro.kherel.selfprivacy/" rel="noopener noreferrer" target="_blank">
 				F-Droid
 			</a>
-			<a class="btn btn-link w-100" href="https://fdroid.selfprivacy.org/" rel="noopener noreferrer" target="_blank">
+			<a class="w-100 btn btn-link w-100" href="https://fdroid.selfprivacy.org/" rel="noopener noreferrer" target="_blank">
 				Our F-Droid repository
 			</a>
 		</div>
 		<div class="col-md-4">
-			<a class="btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding" href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" rel="noopener noreferrer" target="_blank">
+			<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding" href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" rel="noopener noreferrer" target="_blank">
 				APK File
 			</a>
 		</div>
 		<div class="col-md-4">
-			<a class="btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding" href="https://play.google.com/store/apps/details?id=org.selfprivacy.app" rel="noopener noreferrer" target="_blank">
+			<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding" href="https://play.google.com/store/apps/details?id=org.selfprivacy.app" rel="noopener noreferrer" target="_blank">
 				Google Play
 			</a>
 		</div>
 	</div>
 
-
 {{< /blocks/section >}}
 
 {{< blocks/section color="white" type="section" >}}
@@ -63,17 +59,17 @@ title: Downloads
 
 <div class="row w-100">
 		<div class="col-md-4">
-			<a class="btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding disabled" href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" rel="noopener noreferrer" target="_blank">
+			<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding disabled" href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" rel="noopener noreferrer" target="_blank">
 				Windows
 			</a>
 		</div>
 		<div class="col-md-4">
-			<a class="btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding" href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" rel="noopener noreferrer" target="_blank">
+			<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding" href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" rel="noopener noreferrer" target="_blank">
 				GNU/Linux
 			</a>
 		</div>
 		<div class="col-md-4">
-			<a class="btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding disabled" href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" rel="noopener noreferrer" target="_blank">
+			<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding disabled" href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" rel="noopener noreferrer" target="_blank">
 				MacOS
 			</a>
 		</div>
@@ -84,7 +80,7 @@ title: Downloads
 {{< blocks/section type="section" >}}
 
 	{{< landing-feature book "What to do next?" "right" >}}
-		<a class="btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding" href="{{< relref "/docs/Getting started/" >}}">
+		<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding" href="{{< relref "/docs/Getting started/" >}}">
 					Setup guide
 			</a>
 	{{< /landing-feature >}}

content/ru/_index.html

@@ -8,7 +8,7 @@ linkTitle = "SelfPrivacy"
 	<div class="flex-md-row flex-column-reverse d-flex justify-content-center align-content-center">
 		<div class="col-xs-12 col-md-4">
 			<div class="container rounded">
-				<div id="screenshotsCarouselControls" class="carousel slide" data-ride="carousel">
+				<div id="screenshotsCarouselControls" class="carousel slide" data-bs-ride="carousel">
 					<div class="carousel-inner rounded">
 						<div class="carousel-item">
 							<img class="d-block w-100" src="/images/screenshots/1-ru.png" alt="Первый слайд">
@@ -33,24 +33,22 @@ linkTitle = "SelfPrivacy"
 						</div>
 					</div>
 					<ol class="carousel-indicators">
-						<li data-target="#screenshotsCarouselControls" data-slide-to="0" class="active"></li>
-						<li data-target="#screenshotsCarouselControls" data-slide-to="1"></li>
-						<li data-target="#screenshotsCarouselControls" data-slide-to="2"></li>
-						<li data-target="#screenshotsCarouselControls" data-slide-to="3"></li>
-						<li data-target="#screenshotsCarouselControls" data-slide-to="4"></li>
-						<li data-target="#screenshotsCarouselControls" data-slide-to="5"></li>
-						<li data-target="#screenshotsCarouselControls" data-slide-to="6"></li>
+						<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="0" class="active"></li>
+						<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="1"></li>
+						<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="2"></li>
+						<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="3"></li>
+						<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="4"></li>
+						<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="5"></li>
+						<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="6"></li>
 					</ol>
-					<a class="carousel-control-prev" href="#screenshotsCarouselControls" role="button"
-						data-slide="prev">
+					<button class="carousel-control-prev" type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide="prev">
 						<span class="carousel-control-prev-icon" aria-hidden="true"></span>
-						<span class="sr-only">Previous</span>
-					</a>
-					<a class="carousel-control-next" href="#screenshotsCarouselControls" role="button"
-						data-slide="next">
+						<span class="visually-hidden">Назад</span>
+					  </button>
+					  <button class="carousel-control-next" type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide="next">
 						<span class="carousel-control-next-icon" aria-hidden="true"></span>
-						<span class="sr-only">Next</span>
-					</a>
+						<span class="visually-hidden">Далее</span>
+					  </button>					
 				</div>
 			</div>
 		</div>

content/ru/download/_index.html

@@ -2,8 +2,6 @@
 title: Скачать
 ---
 
-<!--add blocks of content here to add more sections to the community page -->
-
 {{< blocks/lead>}}
 	<div class="row w-100 my-4">
 		<h1 class="mx-auto text-center w-100">Загрузки</h1>
@@ -23,86 +21,76 @@ title: Скачать
 
 			<div class="row w-100">
 				<div class="col-md-4">
-					<a class="btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding"
+					<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding"
 						href="https://f-droid.org/en/packages/pro.kherel.selfprivacy/" rel="noopener noreferrer"
 						target="_blank">
 						F-Droid
 					</a>
 				</div>
 				<div class="col-md-4">
-					<a class="btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding"
+					<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding"
 						href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest"
 						rel="noopener noreferrer" target="_blank">
 						APK файл
 					</a>
 				</div>
 				<div class="col-md-4">
-					<a class="btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding disabled"
+					<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding"
 						href="https://play.google.com/store/apps/details?id=org.selfprivacy.app"
 						rel="noopener noreferrer" target="_blank">
 						Google Play
 					</a>
 				</div>
 				<div class="col-md-12">
-					<a class="btn btn-link w-100" href="https://fdroid.selfprivacy.org/" rel="noopener noreferrer"
+					<a class="w-100 btn btn-link w-100" href="https://fdroid.selfprivacy.org/" rel="noopener noreferrer"
 						target="_blank">
 						Наш F-Droid репозиторий
 					</a>
 				</div>
 			</div>
-
-
 			{{< /blocks/section>}}
 
 			{{< blocks/section color="white" type="section">}}
 				<div class="row w-100">
 					<h1 class="mx-auto text-center w-100">iOS</h1>
 				</div>
-
 				<div class="row w-100">
 					<h4 class="mx-auto text-center w-100">Ждите скоро...</h4>
 				</div>
-
 				{{< /blocks/section>}}
-
 					{{< blocks/section type="section" color="dark">}}
 						<div class="row w-100">
 							<h1 class="mx-auto text-center w-100">Компьютер</h1>
 						</div>
-
 						<div class="row w-100">
 							<div class="col-md-4">
-									<a class="btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding"
+								<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding"
 									href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest"
 									rel="noopener noreferrer" target="_blank">
 									Windows
 								</a>
 							</div>
 							<div class="col-md-4">
-									<a class="btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding"
+								<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding"
 									href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest"
 									rel="noopener noreferrer" target="_blank">
 									GNU/Linux
 								</a>
 							</div>
 							<div class="col-md-4">
-									<a class="btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding disabled"
+								<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding disabled"
 									href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest"
 									rel="noopener noreferrer" target="_blank">
 									MacOS
 								</a>
 							</div>
 						</div>
-
 				{{< /blocks/section>}}
-
 				{{< blocks/section type="section">}}
-
 					{{< landing-feature book "Что делать дальше то?" "right">}}
 						<a class="btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding"
 							href="{{< relref "/docs/Getting started/">}}">
 							Гайд по установке
 						</a>
 				{{< /landing-feature>}}
-
 				{{< /blocks/section>}}

go.mod

@@ -3,7 +3,6 @@ module github.com/google/docsy-example
 go 1.12
 
 require (
-	github.com/FortAwesome/Font-Awesome v0.0.0-20220831210243-d3a7818c253f // indirect
-	github.com/google/docsy v0.5.1 // indirect
-	github.com/twbs/bootstrap v4.6.2+incompatible // indirect
+	github.com/google/docsy v0.9.1 // indirect
+	github.com/google/docsy/dependencies v0.5.1 // indirect
 )

go.sum

@@ -1,7 +1,8 @@
-github.com/FortAwesome/Font-Awesome v0.0.0-20220831210243-d3a7818c253f h1:bvkUptSRPZBr3Kxuk+bnWCEmQ5MtEJX5fjezyV0bC3g=
 github.com/FortAwesome/Font-Awesome v0.0.0-20220831210243-d3a7818c253f/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
-github.com/google/docsy v0.5.1 h1:D/ZdFKiE29xM/gwPwQzmkyXhcbQGkReRS6aGrF7lnYk=
-github.com/google/docsy v0.5.1/go.mod h1:maoUAQU5H/d+FrZIB4xg1EVWAx7RyFMGSDJyWghm31E=
+github.com/FortAwesome/Font-Awesome v0.0.0-20240108205627-a1232e345536/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
+github.com/google/docsy v0.9.1 h1:+jqges1YCd+yHeuZ1BUvD8V8mEGVtPxULg5j/vaJ984=
+github.com/google/docsy v0.9.1/go.mod h1:saOqKEUOn07Bc0orM/JdIF3VkOanHta9LU5Y53bwN2U=
+github.com/google/docsy/dependencies v0.5.1 h1:JVVLjnjC5i7GN2ZXKJ0QDa8UY71JMoqkeKK8CS6R/C4=
 github.com/google/docsy/dependencies v0.5.1/go.mod h1:EDGc2znMbGUw0RW5kWwy2oGgLt0iVXBmoq4UOqstuNE=
-github.com/twbs/bootstrap v4.6.2+incompatible h1:TDa+R51BTiy1wEHSYjmqDb8LxNl/zaEjAOpRE9Hwh/o=
 github.com/twbs/bootstrap v4.6.2+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
+github.com/twbs/bootstrap v5.2.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=

layouts/partials/footer.html

@@ -1,7 +1,7 @@
 {{ $links := .Site.Params.links }}
 <div class="bg-dark pt-4 px-5 pb-5 row sp-footer">
 
-      <div class="col-12 order-last order-md-first py-4">
+      <div class="col-12 py-4">
           <a class="navbar-brand" href="{{ .Site.Home.RelPermalink }}">
             <span class="navbar-brand__logo navbar-logo">
               {{- if ne .Site.Params.ui.navbar_logo false -}}

layouts/partials/navbar-lang-selector.html

@@ -1,10 +1,12 @@
 {{/* Link directly to documentation etc., if possible. */}}
 {{ $langPage := cond (gt (len .Translations) 0) . .Site.Home }}
-<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-	<i class="fas fa-globe ml-2"></i>
-</a>
-<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+<div class="dropdown">
+	<a role="button" class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+		<i class="fas fa-globe ms-2"></i>
+	</a>
+	<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
 		{{ range $langPage.AllTranslations }}
-	<a class="dropdown-item" href="{{ .RelPermalink }}">{{ .Language.LanguageName }}</a>
+		<li><a class="dropdown-item" href="{{ .RelPermalink }}">{{ .Language.LanguageName }}</a></li>
 		{{ end }}
+	</ul>
 </div>

layouts/shortcodes/justimg.html

@@ -1,2 +0,0 @@
-{{ $original := .Page.Resources.GetMatch (printf "**%s*" (.Get 0)) }}
-<img class="card-img-top rounded-img" src="{{ $original.RelPermalink }}">