fix conflict

2023-05-28 16:17:47 +03:00
parent 9c55ad57a7 268f349193
commit 2b0e268d61
67 changed files with 139 additions and 336 deletions
--- a/content/activities/boats/img/activities_boats.png
+++ b/content/activities/boats/img/activities_boats.png
--- a/content/activities/chumbe/img/activities_chumbe.jpeg
+++ b/content/activities/chumbe/img/activities_chumbe.jpeg
--- a/content/activities/gardens/img/activities_gardens.png
+++ b/content/activities/gardens/img/activities_gardens.png
--- a/content/activities/img/activities_header_2.png
+++ b/content/activities/img/activities_header_2.png
--- a/content/activities/img/boats.png
+++ b/content/activities/img/boats.png
--- a/content/activities/img/gardens.png
+++ b/content/activities/img/gardens.png
--- a/content/activities/img/mangroves.png
+++ b/content/activities/img/mangroves.png
--- a/content/activities/img/relax.png
+++ b/content/activities/img/relax.png
--- a/content/activities/img/ruins.png
+++ b/content/activities/img/ruins.png
--- a/content/activities/index.md
+++ b/content/activities/index.md
@@ -7,7 +7,9 @@ draft: false
 weight: 4
 ---

-{% row(style="center narrow" margin="header" bgPath="img/activities_header.png" bgStyle="full") %} 
+{% row(style="center narrow" margin="tight" bgPath="img/activities_header_2.png" bgStyle="full") %} 
+
+<div class="bg-gray-200/50 py-4 px-4 rounded-md">

 ## Experience Authentic Paradise
 
@@ -15,12 +17,7 @@ weight: 4

 No worries. Take it easy. Slowly, slowly, or "Pole, pole," as they say on the island. We have plenty of activities and experiences for eco-conscious and nature-loving travelers.

-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
+</div>

 {% end %}

--- a/content/activities/mangroves/img/activities_mangroves.png
+++ b/content/activities/mangroves/img/activities_mangroves.png
--- a/content/activities/relax/img/activities_relax.png
+++ b/content/activities/relax/img/activities_relax.png
--- a/content/activities/ruins/img/activities_ruins.png
+++ b/content/activities/ruins/img/activities_ruins.png