fix conflict

content/_index.md

@@ -7,5 +7,5 @@ draft: false
 sort_by: weight
 weight: 1
 extra:
-    logo_path: images/logo_placeholder_owp.png
+    logo_path: images/logo_placeholder_eden_small.png
 ---

content/about/index.md

@@ -9,7 +9,9 @@ weight: 2
 
 <!-- section 1 (JP) -->
 
-{% row(style="center narrow" margin="header" bgPath="img/about_header.png" bgStyle="full") %}
+{% row(style="center narrow" margin="tight" bgPath="img/opwhy.jpg" bgStyle="full") %}
+
+<div class="bg-gray-200/50 py-4 px-4 rounded-md">
 
 ## About Us
 
@@ -17,12 +19,7 @@ weight: 2
 
 We are fortunate enough to have found this special place and bold enough to turn our dreams into reality. Together we can show people the beauty of our world and help them find themselves in these hectic times.
 
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
+</div>
 
 {% end %}
 
@@ -78,13 +75,13 @@ Primarily we are focused on building **[a decentralized Internet](https://threef
 
 {% row(bgColor="#FFFFFF" margin="moderate" padding="bottom" id="botanical") %}
 
-![Purpose](img/purpose.jpg#medium)
+![Purpose](img/purpose.jpg#mx-auto)
 
 |||
 
 ### Our Purpose
 
-<p>We aim to provide a space in which people feel at home and can create, live, work, heal, taste, learn, and experience. Eden will be a co-owned space in line with nature which will be fully sustainable and organic. The unique environment around us makes it possible – from Chumbe Island to the mangroves, the beach and sea, the ruins, the botanical garden.)</p>
+We aim to provide a space in which people feel at home and can create, live, work, heal, taste, learn, and experience. Eden will be a co-owned space in line with nature which will be fully sustainable and organic. The unique environment around us makes it possible – from Chumbe Island to the mangroves, the beach and sea, the ruins, the botanical garden.
 
 #### **Now or In-Motion**
 
@@ -125,6 +122,6 @@ Primarily we are focused on building **[a decentralized Internet](https://threef
 
 |||
 
-![Manifesto](img/manifesto.png#medium)
+![Manifesto](img/manifesto.png#mx-auto)
 
 {% end %}

content/action/index.md

@@ -7,23 +7,22 @@ draft: false
 weight: 6
 ---
 
-{% row(style="center narrow" margin="header" bgPath="img/action_header.png" bgStyle="full") %}
+{% row(style="center narrow" margin="tight" bgPath="img/join_header.png" bgStyle="full") %}
+
+<div class="bg-gray-200/50 py-4 px-4 rounded-md">
 
 ## Calling Dreamers & Doers
 
 ### A Dream Becomes Reality
 
-There are many ways to join in on the efforts to bring the vision to life. Come to Zanzibar to collaborate in-person, buy EDEN (below), or support from afar. Today we are already operating from this location and making initial steps.
+There are many ways to join in on the efforts to bring the vision to life. Come to Zanzibar to collaborate in-person, buy EDN (below), or support from afar. Today we are already operating from this location and making initial steps.
 
 Our primary focus is on **raising $4M USD by June 2023** in order to take on full ownership and finance the project. We cannot do this without the support of like-minded believers.
 
  <button>[Investment Paper: Soon]()</button>
  <button>[Get In Touch](https://docs.google.com/forms/d/e/1FAIpQLSe33Kz4pi3qnNtv115cgSnKCYHZTxZxtPoZKXbaBcWgNbd2qw/viewform)</button>
 
- <br>
- <br>
- <br>
- <br>
+</div>
 
 {% end %}
 
@@ -35,7 +34,7 @@ Our primary focus is on **raising $4M USD by June 2023** in order to take on ful
 
 # A Token for Co-Ownership
 
-We are introducing a token called EDN. EDN Tokens are not crypto currencies, they are pre-purchase tokens of Eden and represent ownership/utilization in the ecosystem. You can always re-sell your EDN tokens or use them to participate in the Eden World.
+We are introducing a token called EDN. EDN Tokens are not crypto currencies, they are pre-purchase tokens of Eden and represent ownership/utilization in the ecosystem. You can always re-sell your EDN tokens or use them to participate in the Eden universe.
 
 {% end %}
 

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 %}
 

content/header/index.md

@@ -1,165 +0,0 @@
----
-title: "Header"
-insert_anchor_links: "left"
-template: "partials/header.html"
-extra:
-  logoPath: "images/black_threefold.png"
-  button_Path: "/images/gettft_white.png"
----
-
-
-- [Mission]("/mission")
-- [Grid]("/grid")
-- [Build]("/build")
-- [Farm]("/farm")
-- [TFT]("/tft")
-- Ecosystem
-
-{% row() %}
-
-<button onclick="window.location.href='/people'">
-
-[Our People](/people)
-<br>
-<p class="text-sm">Team, stories, & more</p>
-
-</button>
-
-|||
-
-<button onclick="window.location.href='/partners'">
-
-[Our Partners](/partners)
-<br>
-<p class="text-sm">Explore Our Partners</p>
-
-|||
-
-<button onclick="window.location.href='/community'">
-
-[ThreeFold Community](/community)
-<br>
-<p class="text-sm">Welcome To The Fold</p>
-
-</button>
-
-|||
-
-<button onclick="window.location.href='/developer'">
-
-[Developer Resources](/developer)
-<br>
-<p class="text-sm">Join The Developer Community</p>
-
-</button>
-
-{% end %}
-
-- MoreInfo
-
-{% row(style="wide") %}
-
-
-#### Tools
-
-<button onclick="openInNewTab('https&#58;//library.threefold.me/info/threefold#/tokens/threefold__threefold_connect')">
-
-[ThreeFold Connect](https://library.threefold.me/info/threefold#/tokens/threefold__threefold_connect)
-<br>
-<p class="text-sm">TFT Wallet, 2FA, & More</p>
-
-</button>
-
-<button onclick="openInNewTab('https&#58;//dashboard.grid.tf/')">
-
-[Dashboard](https://dashboard.grid.tf/)
-<br>
-<p class="text-sm">Portal & Capacity Explorer</p>
-
-</button>
-
-<button onclick="openInNewTab('https&#58;//play.grid.tf')">
-
-[Weblet Playground](https://play.grid.tf)
-<br>
-<p class="text-sm">Deploy a VM & More</p>
-
-|||
-
-#### Resources 
-
-<button onclick="openInNewTab('https&#58;//library.threefold.me/info/threefold#/')">
-
-[Library](https://library.threefold.me/info/threefold#/)
-<br>
-<p class="text-sm">Explore the Documentation</p>
-
-</button>
-
-<button onclick="openInNewTab('https&#58;//library.threefold.me/info/manual/#/manual__manual3_home_new')">
-
-[Manual](https://library.threefold.me/info/manual/#/manual__manual3_home_new)
-<br>
-<p class="text-sm">Get Started on the Grid</p>
-
-</button>
-
-<button onclick="openInNewTab('https&#58;//github.com/')">
-
-[GitHub](https://github.com/)
-<br>
-<p class="text-sm">Code Library & Documentation</p>
-
-|||
-
-#### Dive Deeper
-
-<button onclick="window.location.href='/blog'">
-
-[Blog](/blog)
-<br>
-<p class="text-sm">Explore the Blogs</p>
-
-</button>
-
-<button onclick="window.location.href='/newsroom'">
-
-[Newsroom](/newsroom)
-<br>
-<p class="text-sm">Check the Latest Updates</p>
-
-</button>
-
-<button onclick="openInNewTab('https&#58;//intro.threefold.me')">
-
-[Intro Docs](https://intro.threefold.me)
-<br>
-<p class="text-sm">Perfect for Newcomers</p>
-
-|||
-
-#### Support & Help
-
-<button onclick="openInNewTab('https&#58;//forum.threefold.io')">
-
-[Forum](https://forum.threefold.io)
-<br>
-<p class="text-sm">Questions & Feedback</p>
-
-<button onclick="window.location.href='/support'">
-
-[Support](/support)
-<br>
-<p class="text-sm">Speak Live with a Human</p>
-
-</button>
-
-<button onclick="window.location.href='/careers'">
-
-[Careers](/careers)
-<br>
-<p class="text-sm">Join the Team</p>
-
-</button>
-
-{% end %}

content/home/index.md

@@ -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 %}

content/location/index.md

@@ -8,7 +8,9 @@ weight: 3
 ---
 <!-- section 1 (Locations) -->
 
-{% row(style="center narrow" margin="header" bgPath="img/location_header.png" bgStyle="full") %}
+{% row(style="center narrow" margin="tight" bgPath="img/luxury.jpeg" bgStyle="full") %}
+
+<div class="bg-gray-200/50 py-4 px-4 rounded-md">
 
 ## Our Location
 
@@ -18,12 +20,7 @@ You can find us on the west coast of Zanzibar, alongside 150 meters of mangrove-
 
  <button>[Learn the History](/location/history)</button>
 
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
+</div>
 
 {% end %}
 
@@ -39,31 +36,31 @@ Discover authentic paradise. Roughly ten minutes from world heritage site Stone
 
 {% row(style="center" margin="narrow" padding="none") %}
 
-![Jungle](img/mbweni.jpg)
+![Jungle](img/mbweni.jpg#mx-auto)
 
 #### **Jungle Paradise**
 
 For short term stays. A beachfront hotel that sits beside historical ruins, all surrounded by beautiful lush gardens featuring a wide variety of native and exotic plants. 
 
  <button>[Info](/location/mbweni)</button>
- <a href=https://hotels.cloudbeds.com/reservation/DNw5Ek target=“_blank”> <button> Stay </button> </a>
+ <a href=https://hotels.cloudbeds.com/reservation/DNw5Ek target=“_blank”> <button> Book a Stay </button> </a>
 
 |||
 
-![Seaview Apartments](img/seaview_apts.png)
+![Seaview Apartments](img/seaview_apts.png#mx-auto)
 
 #### **Seaview Apartments**
 
 For long-term stays. Two apartment buildings, with four three-bedroom spaces and one rooftop penthouse each. Private beach and direct access to Jungle Paradise.
 
  <button>[Info: Coming Soon]()</button>
- <button>[Stay: Coming Soon]()</button>
+ <a href='https://www.airbnb.com/rooms/862002310134454615?guests=1&adults=1&s=67&unique_share_id=845bb97b-f61c-4540-9f50-8d20dabfb042&source_impression_id=p3_1681142141_s2c4V86U9bhXi9Jv' target="_blank"> <button> Book a Stay </button> </a>
 
 {% end %}
 
 {% row(style="center" margin="narrow" padding="none") %}
 
-![Gardens](img/ruins.jpg)
+![Gardens](img/ruins.jpg#mx-auto)
 
 ##### **Mbweni Ruins**
 
@@ -73,7 +70,7 @@ We share space with historic ruins of a school for freed slaves (1874) with asso
 
 |||
 
-![Gardens](img/gardens.jpg)
+![Gardens](img/gardens.jpg#mx-auto)
 
 #### **Botanical Gardens**
 
@@ -85,7 +82,7 @@ The Gardens here are beautiful and mature, with more than 280 tree and plant spe
 
 {% row(style="center" margin="narrow" padding="none") %}
 
-![Boats](img/boat.png)
+![Boats](img/boat.png#mx-auto)
 
 #### **Boats**
 
@@ -95,7 +92,7 @@ Guests and visitors are invited to book experiences on our two sailing boats –
 
 |||
 
-![OurOffice](img/ouroffice.png)
+![OurOffice](img/ouroffice.png#mx-auto)
 
 #### **OurOffice**
 
@@ -107,7 +104,7 @@ A three-floor office space perfect for co-working and collaboration. Convenientl
 
 {% row(style="center" margin="narrow" padding="bottom") %}
 
-![Chumbe Island](img/chumbe.jpeg)
+![Chumbe Island](img/chumbe.jpeg#mx-auto)
 
 #### **Chumbe Island** (Friends of the Project)
 
@@ -117,7 +114,7 @@ An award-winning private nature reserve, home to one of the world's most pristin
 
 |||
 
-![OurOffice](img/ayurvedic.jpg)
+![OurOffice](img/ayurvedic.jpg#mx-auto)
 
 #### **Healing Center: Coming 2023**
 
@@ -129,7 +126,7 @@ The center will combine advanced regenerative healing practices with ancient and
 
 {% row(bgColor="#FFFFFF" margin="moderate" padding="bottom" id="fflow_grid") %}
 
-![map](img/map.png)
+![map](img/map.png#mx-auto)
 
 |||
 
@@ -154,7 +151,7 @@ If you need transportation to a different part of the island, simply let us know
 
 {% row(style="center" margin="narrow" padding="bottom") %}
 
-![Regenerative Farm](img/regenerative_farm.jpg)
+![Regenerative Farm](img/regenerative_farm.jpg#mx-auto)
 
 #### **Regenerative Farms**
 
@@ -162,7 +159,7 @@ Up to 500 hectares of fertile Tanzanian land for the purpose of sustainable farm
 
 |||
 
-![](img/ecobeach.png)
+![](img/ecobeach.png#mx-auto)
 
 #### **Eco Beach Villas**
 

content/protection/index.md

@@ -9,7 +9,9 @@ weight: 4
 
 <!-- section 1 (JP) -->
 
-{% row(style="center narrow" margin="header" bgPath="img/protection_header.png" bgStyle="full") %}
+{% row(style="center narrow" margin="tight" bgPath="img/protectheader.jpg" bgStyle="full") %}
+
+<div class="bg-gray-200/50 py-4 px-4 rounded-md">
 
 ## Programs to Protect
 
@@ -19,12 +21,7 @@ By creating our own paradise we have a responsibility to the planet. Most of the
 
   <button>[Support the Project](/action)</button>
 
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
+</div>
 
 {% end %}