From 53b1e00ac5d2be2c23f3dbb7b5c4c2089db65ea5 Mon Sep 17 00:00:00 2001
From: nevfy <yaver4.0.0.0@gmail.com>
Date: Sat, 27 Apr 2024 16:17:09 +0300
Subject: [PATCH] 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"
 			<div class="container rounded">
 				<div id="screenshotsCarouselControls" class="carousel slide" data-bs-ride="carousel">
 				  <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">
 					</div>
 					<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">
 					</div>
 				  </div>
-				  <ol class="carousel-indicators">
-					<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>
+				  <div class="carousel-indicators">
+					<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="0" class="active" aria-current="true"></button>
+					<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="1"></button>
+					<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="2"></button>
+					<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="3"></button>
+					<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="4"></button>
+					<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="5"></button>
+					<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="6"></button>
+				  </div>
 				  <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="visually-hidden">Previous</span>
diff --git a/layouts/shortcodes/landing-feature.html b/layouts/shortcodes/landing-feature.html
index 1040c69..fd9b408 100644
--- a/layouts/shortcodes/landing-feature.html
+++ b/layouts/shortcodes/landing-feature.html
@@ -4,27 +4,31 @@
 {{ $side := .Get 3 }}
 {{ 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="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 }}
                 <h2 class="sp-feature-title">{{ $title }}</h2>
             {{ end }}
             {{ .Inner }}
         </div>
         {{ 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">
                     <i class="fa-solid fa-triangle-exclamation"></i>
                 </div>
             </object>
+        </div>
         {{ end }}
     {{ 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 }}">
         {{ 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 }}">
                 <div class="error sp-feature-img">
                     <i class="fa-solid fa-triangle-exclamation"></i>
                 </div>
             </object>
+        </div>
         {{ end }}
         <div class="col-xl-4 col-lg-6 col-md-8 col-xs-12 px-5">
             {{ if $title }}