mirror of
https://git.selfprivacy.org/SelfPrivacy/selfprivacy.org.git
synced 2025-01-15 13:26:37 +00:00
fix: bad merge
This commit is contained in:
parent
e82b38b504
commit
53b1e00ac5
|
@ -190,4 +190,5 @@ a, a.btn-link {
|
||||||
border-radius: .5rem;
|
border-radius: .5rem;
|
||||||
& > i {
|
& > i {
|
||||||
color: lightgray;
|
color: lightgray;
|
||||||
}
|
}
|
||||||
|
}
|
|
@ -10,7 +10,7 @@ linkTitle = "SelfPrivacy"
|
||||||
<div class="container rounded">
|
<div class="container rounded">
|
||||||
<div id="screenshotsCarouselControls" class="carousel slide" data-bs-ride="carousel">
|
<div id="screenshotsCarouselControls" class="carousel slide" data-bs-ride="carousel">
|
||||||
<div class="carousel-inner rounded">
|
<div class="carousel-inner rounded">
|
||||||
<div class="carousel-item">
|
<div class="carousel-item active">
|
||||||
<img class="d-block w-100" src="/images/screenshots/1-en.png" alt="First slide">
|
<img class="d-block w-100" src="/images/screenshots/1-en.png" alt="First slide">
|
||||||
</div>
|
</div>
|
||||||
<div class="carousel-item">
|
<div class="carousel-item">
|
||||||
|
@ -32,15 +32,15 @@ linkTitle = "SelfPrivacy"
|
||||||
<img class="d-block w-100" src="/images/screenshots/7-en.png" alt="Seventh slide">
|
<img class="d-block w-100" src="/images/screenshots/7-en.png" alt="Seventh slide">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ol class="carousel-indicators">
|
<div class="carousel-indicators">
|
||||||
<li data-bs-target="#screenshotsCarouselControls" data-slide-to="0" class="active"></li>
|
<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="0" class="active" aria-current="true"></button>
|
||||||
<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="1"></li>
|
<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="1"></button>
|
||||||
<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="2"></li>
|
<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="2"></button>
|
||||||
<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="3"></li>
|
<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="3"></button>
|
||||||
<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="4"></li>
|
<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="4"></button>
|
||||||
<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="5"></li>
|
<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="5"></button>
|
||||||
<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="6"></li>
|
<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="6"></button>
|
||||||
</ol>
|
</div>
|
||||||
<button class="carousel-control-prev" type="button" data-bs-target="#screenshotsCarouselControls" data-bs-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="carousel-control-prev-icon" aria-hidden="true"></span>
|
||||||
<span class="visually-hidden">Previous</span>
|
<span class="visually-hidden">Previous</span>
|
||||||
|
|
|
@ -4,27 +4,31 @@
|
||||||
{{ $side := .Get 3 }}
|
{{ $side := .Get 3 }}
|
||||||
{{ if eq $side "right" }}
|
{{ if eq $side "right" }}
|
||||||
<div class="d-flex flex-column flex-lg-row flex-xl-row justify-content-center align-items-center sp-feature sp-feature{{ $bg }} my-auto">
|
<div class="d-flex flex-column flex-lg-row flex-xl-row justify-content-center align-items-center sp-feature sp-feature{{ $bg }} my-auto">
|
||||||
<div class="flex-none col-xl-4 col-lg-6 col-md-8 col-xs-12 px-5">
|
<div class="col-xl-4 col-lg-6 col-md-8 col-xs-12 px-5">
|
||||||
{{ if $title }}
|
{{ if $title }}
|
||||||
<h2 class="sp-feature-title">{{ $title }}</h2>
|
<h2 class="sp-feature-title">{{ $title }}</h2>
|
||||||
{{ end }}
|
{{ end }}
|
||||||
{{ .Inner }}
|
{{ .Inner }}
|
||||||
</div>
|
</div>
|
||||||
{{ if $illustration }}
|
{{ if $illustration }}
|
||||||
<object role="img" class="col-lg-4 col-md-6 col-sm-8 col-xs-12 my-auto d-flex justify-content-center align-items-center card-img-top" type="image/svg+xml" data="{{ $illustration.RelPermalink }}">
|
<div class="col-lg-4 col-md-6 col-sm-8 col-xs-12">
|
||||||
|
<object role="img" class="my-auto d-flex justify-content-center align-items-center card-img-top" type="image/svg+xml" data="{{ $illustration.RelPermalink }}">
|
||||||
<div class="error sp-feature-img">
|
<div class="error sp-feature-img">
|
||||||
<i class="fa-solid fa-triangle-exclamation"></i>
|
<i class="fa-solid fa-triangle-exclamation"></i>
|
||||||
</div>
|
</div>
|
||||||
</object>
|
</object>
|
||||||
|
</div>
|
||||||
{{ end }}
|
{{ end }}
|
||||||
{{ else }}
|
{{ else }}
|
||||||
<div class="d-flex flex-column-reverse flex-lg-row flex-xl-row justify-content-center align-items-center sp-feature sp-feature{{ $bg }}">
|
<div class="d-flex flex-column-reverse flex-lg-row flex-xl-row justify-content-center align-items-center sp-feature sp-feature{{ $bg }}">
|
||||||
{{ if $illustration }}
|
{{ if $illustration }}
|
||||||
|
<div class="col-lg-4 col-md-6 col-sm-8 col-xs-12">
|
||||||
<object role="img" class="col-lg-4 col-md-6 col-sm-8 col-xs-12 my-auto d-flex justify-content-center align-items-center card-img-top" type="image/svg+xml" data="{{ $illustration.RelPermalink }}">
|
<object role="img" class="col-lg-4 col-md-6 col-sm-8 col-xs-12 my-auto d-flex justify-content-center align-items-center card-img-top" type="image/svg+xml" data="{{ $illustration.RelPermalink }}">
|
||||||
<div class="error sp-feature-img">
|
<div class="error sp-feature-img">
|
||||||
<i class="fa-solid fa-triangle-exclamation"></i>
|
<i class="fa-solid fa-triangle-exclamation"></i>
|
||||||
</div>
|
</div>
|
||||||
</object>
|
</object>
|
||||||
|
</div>
|
||||||
{{ end }}
|
{{ end }}
|
||||||
<div class="col-xl-4 col-lg-6 col-md-8 col-xs-12 px-5">
|
<div class="col-xl-4 col-lg-6 col-md-8 col-xs-12 px-5">
|
||||||
{{ if $title }}
|
{{ if $title }}
|
||||||
|
|
Loading…
Reference in a new issue