fix conflict

This commit is contained in:
2023-05-28 16:17:47 +03:00
67 changed files with 139 additions and 336 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 MiB

After

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 MiB

After

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 967 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 MiB

After

Width:  |  Height:  |  Size: 3.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 795 KiB

After

Width:  |  Height:  |  Size: 573 KiB

View File

@@ -9,7 +9,9 @@ weight: 1
<!-- section 1 -->
{% row(style="center narrow" margin="header" bgPath="img/home_header.png" bgStyle="full") %}
{% row(style="center narrow" margin="tight" bgPath="img/new_home.png" bgStyle="full") %}
<div class="bg-gray-200/50 py-4 px-4 rounded-md">
## Welcome to Eden
@@ -19,54 +21,77 @@ On the west coast of Zanzibar sits a beautiful and historical community space fo
*We invite you to use the chat on the bottom-right of your screen to get assistance.*
</div>
{% end %}
<br>
{% row(style="center narrow" margin="header" bgPath="img/home_about.png" bgStyle="full") %}
{% row(style="center narrow" margin="tight" bgPath="img/ruins_big.jpg" bgStyle="full") %}
<div class="bg-gray-200/50 py-4 px-4 rounded-md">
## [About](/about)
Learn more about our project and who we are.
</div>
{% end %}
<br>
{% row(style="center narrow" margin="header" bgPath="img/home_location.png" bgStyle="full") %}
{% row(style="center narrow" margin="tight" bgPath="img/location_big.jpg" bgStyle="full") %}
<div class="bg-gray-200/50 py-4 px-4 rounded-md">
## [Location](/location)
Get to know where we are and its history.
</div>
{% end %}
<br>
{% row(style="center narrow" margin="header" bgPath="img/home_activities.png" bgStyle="full") %}
{% row(style="center narrow" margin="tight" bgPath="img/activities_big.png" bgStyle="full") %}
<div class="bg-gray-200/50 py-4 px-4 rounded-md">
## [Activities](/activities)
Find out what paradise has to offer.
</div>
{% end %}
<br>
{% row(style="center narrow" margin="header" bgPath="img/home_protection.png" bgStyle="full") %}
{% row(style="center narrow" margin="tight" bgPath="img/protection_big.jpg" bgStyle="full") %}
<div class="bg-gray-200/50 py-4 px-4 rounded-md">
## [Protection](/protection)
Discover how we aim to preserve this place.
</div>
{% end %}
<br>
{% row(style="center narrow" margin="header" bgPath="img/home_action.png" bgStyle="full") %}
{% row(style="center narrow" margin="tight" bgPath="img/coown_big.png" bgStyle="full") %}
<div class="bg-gray-200/50 py-4 px-4 rounded-md">
## [Action](/action)
Get involved in turning dream into reality.
</div>
{% end %}