update readme

.github/workflows/tf_update.yml

@@ -1,23 +0,0 @@
-name: ourparadise.ourworld.tf
-on:
-  push:
-    branch: [main]
-
-jobs:
-  job_one:
-    name: Deploy
-    runs-on: ubuntu-latest
-    steps:
-      - name: pushing latest change on ourparadise.ourworld.tf
-        uses: appleboy/ssh-action@master
-        with:
-          host: ourparadise.ourworld.tf
-          username: webuser
-          key: ${{ secrets.TF_SECRET }}
-          port: 34022
-          script: |
-            cd websites/www_ourparadise/
-            git log -1
-            git restore .
-            git pull
-            bash build.sh

.github/workflows/tf_update_dev.yml

@@ -0,0 +1,24 @@
+name: www2.ourparadise.ourworld.tf
+on:
+  push:
+    branches: [ development ]
+
+jobs:
+  job_one:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - name: pushing latest change on www2.ourparadise.ourworld.tf
+      uses: appleboy/ssh-action@master
+      with:
+        host: www2.ourparadise.ourworld.tf
+        username: webuser
+        key: ${{ secrets.TF_SECRET }}
+        port: 34022
+        script: |
+          cd websites/www2/www_ourparadise/
+          git log -1
+          git fetch
+          git reset --hard origin/development
+          sed -i "s/https:\/\/ourparadise.ourworld.tf/https:\/\/www2.ourparadise.ourworld.tf/g" config.toml
+          ./build.sh

.github/workflows/tf_update_prod.yml

@@ -0,0 +1,24 @@
+name: ourparadise.ourworld.tf
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  job_one:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - name: pushing latest change on ourparadise.ourworld.tf
+      uses: appleboy/ssh-action@master
+      with:
+        host: ourparadise.ourworld.tf
+        username: webuser
+        key: ${{ secrets.TF_SECRET }}
+        port: 34022
+        script: |
+          cd websites/www_ourparadise/
+          git log -1
+          git fetch
+          git reset --hard origin/master
+          sed -i "s/https:\/\/www2.ourparadise.ourworld.tf/https:\/\/ourparadise.ourworld.tf/g" config.toml
+          ./build.sh

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright Incubaid NV Belgium
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,108 +1,42 @@
-# OUR PARADISE Website
+## OurParadise Website Repository
 
-wesite on https://ourparadise.ourworld.tf/
+The official website of OurParadise, powered by Ourworld.
 
-> More info see [gdoc](https://docs.google.com/document/d/1RuWIVcuhSE5BGF1HkgXqKVOcF31g0CQR-EjhcAAlHoA/edit#)
+production(master branch) [https://ourparadise.ourworld.tf/](ourparadise.ourworld.tf)
 
-## Developers
+staging(development branch) [https://www2.ourparadise.ourworld.tf/](www2.ourparadise.ourworld.tf/)
 
-A website created using Zola, a static site generator.
+Last Updated: March 2023
 
-- The contents of the pages reside in the markdown files in /content (written in CommmonMark)
-- The pages are rendered using HTML templates with Tailwind CSS framework in /templates
+## Contribution
 
-### Getting Started
+Feel free to [create a new issue](https://github.com/ourworld-tsc/www_ourparadise/issues) to report an error on the website, or if you have any suggestions on website improvements. 
 
-This repository is meant to use as a template for static sites.
+## Administrators
+[ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin)
 
-To use this repository as a template, simply:
+## Direct Contribution Procedure
 
-- clone repository
-- add your own content to templates directory (see more below)
-- [install Zola](https://www.getzola.org/documentation/getting-started/installation/),
-- run `npm install` to install dependencies
-- run `npm run start`
+![readme](https://user-images.githubusercontent.com/43240801/236867088-56c95abd-510c-4202-b0c5-317cdfb75cb3.png)
 
-### How to create pages using this template
+It is highly important to follow this procedure to contribute to the website content. <br>
+__WARNING__: DO NOT commit straight into __master__ / __development__ branch.
 
-#### Structure of the content directory
+1. Create an Issue
+Feel free to [create a new issue](https://github.com/threefoldfoundation/www_threefold_io/issues/new) to report an error on the website, or if you have any suggestions on website improvements. 
 
-Every index.md file in a content directory corresponds to a page, and the landing page is content/\_index.md.
-The path of each page is simply its path relavant to the root of the content directory.
+2. Make your own branch from __'development'__ branch.
+by creating a new branch from 'Master' you will be provided with the latest copy of the live website content.
 
-Ex:
-content/\_index.md -> yoururl.com/
-content/blog/\_index.md -> yoururl.com/blog
-content/careers/index.md or content/careers.md -> yoururl.com/careers
+3. Add your edits into your own branch via code editor locally, and push your local changes online. WARNING: DO NOT add your edits straight into __master__ / __development__ branch.
 
-#### Section Templates
+5. Create a PR to merge your own branch into '**development**', and assign one of [ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin) on your PR as reviewer, or assign @sasha-astiadi as reviewer.
 
-##### Blog.html
+7. When PR is approved, you can see your changes on staging env on www2.threefold.io (development branch)
 
-The blog page is created by default if there is a blog folder in the content directory. The blog page consists of a featured post row, a paginated grid of posts sorted by recency, and a side nav of post categories and featured posts.
+8. Admin will then create a PR to merge 'development' into into '**master**' (production branch)
 
-Blog posts can have categories, and can be filtered by said categries. To add a new category simply define the posts category in the yaml header of the blog's index.md file. See /content/blog/2019/01/post-3/index.md for example. The side navigation and category based listing will be automatically updated.
+10. When PR is approved, you can see your changes live on production  (master branch).
 
-To make a blog post featured, simply add an isFeatured attribute to the yaml header of the blog post. The most recent featured blog post wiil be displayed on the heading row of the blog page, and the rest will be displayed under featured posts in the side nav. See /content/blog/2019/03/post-5/index.md for implementation.
 
-##### Section.html
 
-The default section template, displays section body without styling (except for margins), and displays subpages of the section below. The subpages of the page are displayed as small summaries of pages with title, description, and categories, as rendered by partials/pageBox.html. The subpages are grouped by the taxonomy name passed in as the "group_pages_by" extra attribute, defined in the section's yaml header.
-
-#### Creating custom pages
-
-To create your own page, simply create a markdwn file following the examples provided above.
-By default, the markdown file will be displayed plainly as it is.
-
-#### Page templates
-
-If you wish to display your markdown files in a specific page template, simply define the template you would like to use in the yaml header of your markdown file. For instance, the blogPage.html template displays blog posts with author info, date, side margins, and a hero image on top of the post. See any blog page in /content for implementation.
-
-#### Shortcodes
-
-To give website creators freedom in styling without necessitating getting outside of the /content directory and in to the html files, the template has a few features.
-
-- #### row.html shortcode
-
-Markdown only goes vertical, but this shortcode allows one to add horizontal elements to their web pages. Simply use the {% row() %} {% end %} syntax and place your content in between. The row shortcode can also take a bgPath parameter if you want your row to have a background. (see /content/careers/index.html)
-
-You can create columns in your row by using three vertical bars. ( ||| )
-You can fill in your columns with regular markdown, but they can also be empty.
-
-- #### menu.html
-
-Just like row, menu renders a row with columns split by ( ||| ). However, menu is specifically used to create menu objects for expandible header items. The menu shortcode supports button shortcodes in itself, and provides styling for the menu.
-
-- #### button.html
-
-A simple button shortcode that takes a body and displays it inside a button that is animated on hover. The button also is entirely clickable, and navigates to the first of if any children link elements.
-
-- #### mermaid.html
-
-Simple mermaid shorcode that can be used to create mermaid diagrams in markdown. Also supported in row shortcode.
-
-[Mermaid]("https://mermaid-js.github.io/mermaid/#/")
-
-- #### annotation.html
-
-Simple annotation shorcode that can be used to create annotation objects in markdown.
-
-(note: inline and inline end qualifiers do not work.)
-
-[Annotations]("https://squidfunk.github.io/mkdocs-material/reference/annotations/#usage")
-
-### Image sizing with source paths
-
-You can size your markdown images by adding #small, #medium or #large at the end of the images source url.
-See /content/\_index.md for implementation.
-
-#### Header & Footer
-
-The header and footer are also created from markdown files in the content directory. In /content/header/\_index.md, each header item is bulleted. If a header item has a row beneath it, the row will be displayed as a sub-menu on click. Otherwise, if header item is a link, it will simply navigate to the linked page.
-
-The footer, likewise, is structured using the row shortcode. However the left section with page summary is built in. To edit the site destcription, one should edit the description (in the yaml header) of the footer md file. To edit the social links, simply add the social outlets name and your link into the socialLinks dictionary attribute on the yaml header of the footer/\_index.md. If a social icon exists for the social outlet, the link wiill be automatically rendered within the icon, displayed in the footer.
-
-### Resources & References
-
-This project was started using a [Zola Tailwind starter set](https://github.com/brycewray/zola_twcss)
-Some templates were created using [Tailwind UI](https://tailwindui.com)

config.toml

@@ -67,5 +67,5 @@ paginate_by = 2
 paginate_path = "blog-posts"
 
 [extra]
-header_class = "freeflow"
-footer_class = "freeflow"
+header_class = "customize"
+footer_class = "customize"

content/contact/index.md

@@ -7,7 +7,9 @@ draft: false
 weight: 6
 ---
 
-{% row(style="center narrow" margin="header" bgPath="img/join_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 mx-4 rounded-md">
 
 ## Take Action
 
@@ -19,12 +21,13 @@ Please note **we are now primarily focused on raising $3M in order to fully acqu
 
 <BUTTON><a href="mailto:info@threefold.io">Send us an Email</a></BUTTON>
 
+</div>
 
 {% end %}
 
-{% row(bgColor="#FFFFFF" margin="moderate" padding="both" id="fflow_grid") %}
+{% row(bgColor="#FFFFFF" margin="tight" padding="both" id="fflow_grid") %}
 
-![chumbe](img/token_ownership.jpg#large)
+![chumbe](img/token_ownership.jpg#mx-auto)
 
 |||
 
@@ -34,7 +37,7 @@ We are introducing a token called EDEN. EDEN Tokens are not crypto currencies, t
 
 {% end %}
 
-{% row(bgColor="#F2F2F2" margin="moderate" padding="both" id="fflow_grid") %}
+{% row(style="reverse" bgColor="#F2F2F2" margin="tight" padding="both" id="fflow_grid") %}
 
 # Not For Profit
 
@@ -42,13 +45,13 @@ The OurParadise locations will be owned by not-for-profit entities to make sure
 
 |||
 
-![chumbe](img/nonprofit.jpg#large)
+![chumbe](img/nonprofit.jpg#mx-auto)
 
 {% end %}
 
-{% row(bgColor="#FFFFFF" margin="moderate" padding="both" id="fflow_grid") %}
+{% row(bgColor="#FFFFFF" margin="tight" padding="both" id="fflow_grid") %}
 
-![venture creator](img/venture_creator.png#large)
+![venture creator](img/venture_creator.png#mx-auto)
 
 |||
 

content/education/index.md

@@ -7,7 +7,9 @@ draft: false
 weight: 5
 ---
 
-{% row(style="center narrow" margin="header" bgPath="img/educationheader.jpg" bgStyle="full") %}
+{% row(style="center narrow" margin="tight" bgPath="img/educationheader.jpg" bgStyle="full") %}
+
+<div class="bg-gray-200/50 py-4 px-4 mx-4 rounded-md">
 
 ## Education Initiatives
 
@@ -18,5 +20,6 @@ weight: 5
 
 <button>[Contact Us](/contact)</button>
 
+</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.jpg" bgStyle="full") %}
+{% row(style="center narrow" margin="tight" bgPath="img/home_header.jpg" bgStyle="full") %}
+
+<div class="bg-gray-200/50 py-4 px-4 rounded-md">
 
  ## Welcome to OurParadise
  
@@ -21,11 +23,12 @@ weight: 1
 
  <!-- What if we together create a new "paradise” system not based on scarcity and fear of missing out, but based on trust and abundance? An interconnected network of homes where we can always go to find healing, like-minded people, and safety. -->
 
- <br>
- <br>
+</div>
 
 {% end %}
 
+<div class="container mx-auto">
+
 <!-- section 2  -->
 
 {% row(style="center" margin="narrow" padding="top") %}
@@ -38,7 +41,7 @@ weight: 1
 
 {% row(style="center" margin="narrow" padding="none") %}
 
-![Mbweni Ruins](img/mbweni.jpeg)
+![Mbweni Ruins](img/mbweni.jpeg#mx-auto)
 
 #### **Mbweni Ruins & Jungle Paradise**
 
@@ -48,7 +51,7 @@ Historical ruins surrounded by beautiful lush gardens featuring a variety of nat
 
 |||
 
-![Chumbe Island](img/chumbe.jpeg)
+![Chumbe Island](img/chumbe.jpeg#mx-auto)
 
 #### **Chumbe Island**
 
@@ -70,7 +73,7 @@ An award-winning private nature reserve, home to one of the world's most pristin
 
 {% row(style="center" margin="narrow" padding="bottom") %}
 
-![Regenerative Farm](img/regenerative_farm.jpg)
+![Regenerative Farm](img/regenerative_farm.jpg#mx-auto)
 
 #### **Regenerative Farms**
 
@@ -78,7 +81,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**
 
@@ -94,7 +97,7 @@ Up to 500 hectares of fertile Tanzanian land for the purpose of sustainable farm
 
 {% row(style="center" margin="narrow" padding="bottom") %}
 
-![General Activities](img/beach_activities_2.jpg#mx-auto#large)
+![General Activities](img/beach_activities_2.jpg#mx-auto)
 
 ### Experience
 
@@ -102,7 +105,7 @@ Experience an authentic paradise through diving, snorkeling and tropical garden
 
 |||
 
-![Crafts](img/local_culture.jpg#mx-auto#large)
+![Crafts](img/local_culture.jpg#mx-auto)
 
 ### Crafts
 
@@ -110,7 +113,7 @@ Learn from locals how to produce crafts, from ceramics to clothing and wood-work
 
 |||
 
-![Crafts](img/boats.jpg#mx-auto#large)
+![Crafts](img/boats.jpg#mx-auto)
 
 ### On the Water
 
@@ -126,10 +129,14 @@ Take day or overnight trips on one of our two sailing boats – one an eco-frien
 
 <br>
 
-![Earth Protection](img/earth_pro.png#mx-auto#large)
+![Earth Protection](img/earth_pro.png#mx-auto)
+
+<br>
 
 By creating our own paradise we have a responsibility to the planet. As such, we have four initial projects to ensure the conservation and regeneration of OurParadise – Chumbe Island, Mbweni Ruins, Mbweni Botanical Gardens, and the Mbweni Mangrove Forest.
 
 <button>[Learn More](/protection)</button>
 
 {% end %}
+
+</div>

content/locations/chumbe/index.md

@@ -8,7 +8,9 @@ weight: 3
 ---
 <!-- section 1 (JP) -->
 
-{% row(style="center narrow" margin="header" bgPath="img/chumbe2.png" bgStyle="full") %}
+{% row(style="center narrow" margin="tight" bgPath="img/chumbe2.png" bgStyle="full") %}
+
+<div class="bg-gray-200/50 py-4 px-4 rounded-md">
 
 # Chumbe Island
 
@@ -18,8 +20,13 @@ weight: 3
 
 Chumbe Island in the Zanzibar archipelago has been a private nature reserve for more than 25 years, protecting a diverse array of life on land and amid its surrounding coral reef sanctuary.
 
+</div>
+
 {% end %}
 
+<div class="container mx-auto">
+
+
 {% row(style="center narrow") %}
 
 ### More About Chumbe Island
@@ -31,15 +38,15 @@ Chumbe Island in the Zanzibar archipelago has been a private nature reserve for
 {% row(bgColor="#FFFFFF" margin="moderate" padding="none" id="fflow_grid") %}
 
 
-![](img/chumbe10.jpeg)
+![](img/chumbe10.jpeg#mx-auto)
 
 |||
 
-![](img/chumbe15.jpeg)
+![](img/chumbe15.jpeg#mx-auto)
 
 |||
 
-![](img/chumbe5.jpeg)
+![](img/chumbe5.jpeg#mx-auto)
 
 {% end %}
 
@@ -47,60 +54,57 @@ Chumbe Island in the Zanzibar archipelago has been a private nature reserve for
 
 {% row(bgColor="#FFFFFF" margin="moderate" padding="top" id="fflow_grid") %}
 
-![](img/chumbe1.jpeg)
+![](img/chumbe1.jpeg#mx-auto)
 
 
 |||
 
-
-<p>
 6 km south of Stone Town, surrounded by pristine coral reefs, Chumbe Island Coral Park is one of the world's most successful ecotourism projects. In 1994 the reef surrounding Chumbe island was created as Tanzania's first Marine National Park.
-</p>
 
-<p>
 Chumbe Island Coral Park won the British Airways Tourism for Tomorrow Award in 1999, in recognition of seven years of conservation work carried out in cooperation with local fishermen, now retrained as marine wardens.
-</p>
 
 {% end %}
 
+
 <!-- section 2 (JP) -->
 
-{% row(bgColor="#FFFFFF" margin="moderate" padding="top" id="fflow_grid") %}
+{% row(style="reserve" bgColor="#FFFFFF" margin="moderate" padding="top" id="fflow_grid") %}
 
-<p>
 Visitors can come for the day to snorkel over the incredible coral reef, which contains over 90% of all coral species ever recorded in East Africa. The reef, declared the 'world's best shallow water coral reef' by the Australian Institute of Marine Science, is home to over 370 species of fish, turtles, and dolphins.
-</p>
 
-<p>
 But to experience Chumbe Island properly, stay the night in one of the seven 'eco-bandas' that nestle in the forest. Each is a two-story, private cottage constructed out of local materials and decorated with shells, driftwood, and colorful local fabrics.
-</p>
 
 |||
 
-![](img/chumbe6.jpeg)
+![](img/chumbe6.jpeg#mx-auto)
 
 {% end %}
 
+
+
 <!-- section 2 (JP) -->
 
 {% row(bgColor="#FFFFFF" margin="moderate" padding="top" id="fflow_grid") %}
 
-![](img/chumbe9.jpeg)
+![](img/chumbe9.jpeg#mx-auto)
 
 |||
 
-<p>
-Water and energy on Chumbe are self-sustaining and provided by nature - the roofs of the bandas and the education center have been designed to catch and filter rainwater, which is then heated by solar power.
-</p>
 
-<p>
+Water and energy on Chumbe are self-sustaining and provided by nature - the roofs of the bandas and the education center have been designed to catch and filter rainwater, which is then heated by solar power.
+
 All profits from tourism on Chumbe Island are reinvested into the conservation and education programs operating in the Park, and the island is staffed and managed by local Zanzibaris from the fishing community, with voluntary support from overseas experts.
-</p>
+
 
 {% end %}
 
-{% row(style="center narrow") %}
+<br>
+<br>
+
+{% row(style="center" margin="moderate" padding="none") %}
 
 <button>[See More Locations](/locations)</button>
 
 {% end %}
+
+</div>

content/locations/dahabiyas/index.md

@@ -8,91 +8,99 @@ weight: 3
 ---
 <!-- section 1 (JP) -->
 
-{% row(style="center narrow" margin="header" bgPath="img/dahabiyasbg.png" bgStyle="full") %}
+{% row(style="center narrow" margin="tight" bgPath="img/dahabiyasbg.png" bgStyle="full") %}
 
+<div class="bg-gray-200/50 py-4 px-4 rounded-md">
 
 # Nile Dahabiyas
 
 ### Unforgettable Sailing Experience
 
-<br>
 
-#### The Nile is not only gorgeous but also an incredibly energy-rich location. <br>The river has always played an important role in global shifting situations.
+The Nile is not only gorgeous but also an incredibly energy-rich location. <br>The river has always played an important role in global shifting situations.
+
+</div>
+
 {% end %}
 
+<div class="container mx-auto">
+
 <!-- section 1 (JP) -->
 
-{% row(bgColor="#FFFFFF" margin="moderate" padding="top" id="fflow_grid") %}
+{% row(style="center" margin="moderate" padding="top" id="fflow_grid") %}
 
 ## Egypt Nile River
 
 {% end %}
 
-{% row(bgColor="#FFFFFF" margin="moderate" padding="none" id="fflow_grid") %}
+<br>
+
+
+{% row(style="reverse" margin="moderate" padding="none" id="fflow_grid") %}
+
 
-<p>
 The Nile is not only gorgeous but also an incredibly energy-rich location. The river has always played an important role in global shifting situations.
-</p>
+
 
 <br>
 
-<p>
+
 We operate 4 boats on the Nile in the original Dahabiya style. Each boat has solar and is made as organic as possible. The Nile is an incredibly fertile area in Africa and is fundamental for the survival of millions of people, today it's not going well enough, education and concrete action is needed now.
-</p>
+
 
 <br>
 
-<p>
+
 Our Impact activities for Egypt include knowledge-creation and awareness education for the farmers along the Nile, farming projects for organic food and hemp to show the economic feasibility, carbon credit harvesting, practical digital education material, stopping the pollution of the Nile and the burning of sugar cane, and inviting experts to come and stay at our facilities to do practical research and help create educational content.
-</p>
+
 
 <br>
 
 |||
 
-![Nile](img/nilelocation1.jpeg#large)
+![Nile](img/nilelocation1.jpeg#mx-auto)
 
-<br>
-
-![Nile](img/dahabiyas.png#large)
+![Nile](img/dahabiyas.png#mx-auto)
 
 {% end %}
 
-{% row(bgColor="#FFFFFF" margin="moderate" padding="top" id="fflow_grid") %}
+
+
+{% row(margin="moderate" padding="top" id="fflow_grid") %}
 
 ![Nile](img/nilelocation3.jpeg)
 
-<br>
-
 ![Nile](img/nile_activities.jpg)
 
 |||
 
-<p>
+
 Today already we have four boats (movable platforms for authentic experiences) with a 30-person team. The boats together total 44 sleeping rooms and 4 educational rooms, along with solar energy and water filtration.
-</p>
+
 
 <br>
 
-<p>
-We're leveraging these boats for the expansion of OurWorld Ecosystem and beyond. Train the Trainer (two-week) sessions will permit us to train those who feel the calling around OurWorld, and allow them to go into the world, advocate, and expand our communities.</p>
+
+We're leveraging these boats for the expansion of OurWorld Ecosystem and beyond. Train the Trainer (two-week) sessions will permit us to train those who feel the calling around OurWorld, and allow them to go into the world, advocate, and expand our communities.
 
 <br>
 
-<p>
+
 Additionally, we organize retreats for investors, business people, and change-makers on the Nile, an extremely powerful energy instrument.
-</p>
+
 
 <br>
 
-<p>
+
 Ultimately, we want to empower any other changemakers to use our platform and organize events – it's proven to be incredibly impactful.
-</p>
+
 
 {% end %}
 
-{% row(style="center narrow") %}
+{% row(style="center") %}
 
 <button>[See More Locations](/locations)</button>
 
 {% end %}
+
+</div>

content/locations/index.md

@@ -8,27 +8,33 @@ weight: 3
 ---
 <!-- section 1 (Locations) -->
 
-{% row(style="center narrow" margin="header" bgPath="img/luxury.jpeg" 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 Locations
 
 ### Discover Places Where You Can Make a Change
 
-<br>
+
 
 OurParadise consists of numerous beautiful eco-friendly destinations – starting in Zanzibar & Tanzania – places where you are invited to learn about local cultures, conservational programs, and contribute to and support the betterment of society.
 
+</div>
+
 {% end %}
 
 <!-- section 2 (Mbweni) -->
 
-{% row(bgColor="#FFFFFF" margin="moderate" padding="top" id="fflow_grid") %}
+<div class="container mx-auto">
 
-![Mbweni](img/mbwenilocation3.jpeg#large)
+{% row(bgColor="#FFFFFF" margin="moderate" padding="both" id="fflow_grid") %}
 
-<br>
+![Mbweni](img/mbwenilocation3.jpeg)
 
-![Mbweni](img/mbwenilocation1.jpeg#large)
+
+
+![Mbweni](img/mbwenilocation1.jpeg)
 
 |||
 
@@ -38,11 +44,15 @@ Historical ruins surrounded by beautiful lush botanical gardens featuring a vari
 
 <button>[Read More](/locations/mbweni)</button>
 
+</div>
+
 {% end %}
 
 <!-- section 3 (Chumbe) -->
 
-{% row(bgColor="#F2F2F2" margin="moderate" padding="top" id="fflow_grid") %}
+{% row(style="reverse" bgColor="#F2F2F2" margin="tight" padding="both" id="fflow_grid") %}
+
+
 
 # Chumbe Island
 
@@ -53,7 +63,9 @@ home to one of the world's most pristine coral reef sanctuary.
 
 |||
 
-![chumbe](img/chumbe_location.jpeg#large)
+![chumbe](img/chumbe_location.jpeg)
+
+
 
 {% end %}
 

content/locations/mbweni/index.md

@@ -8,7 +8,9 @@ weight: 3
 ---
 <!-- section 1 (JP) -->
 
-{% row(style="center narrow" margin="header" bgPath="img/jungle1.png" bgStyle="full") %}
+{% row(style="center narrow" margin="tight" bgPath="img/jungle1.png" bgStyle="full") %}
+
+<div class="bg-gray-200/50 py-4 px-4 rounded-md">
 
 ## Mbweni Ruins & Botanical Gardens
 
@@ -18,8 +20,11 @@ weight: 3
 
 Enjoy the Jungle Paradise beach resort Zanzibar, a unique historical landscape with ocean views resort, cocktails at the beach, with a romantic dinner in the restaurant and a sunset beach club.
 
+</div>
+
 {% end %}
 
+<div class="container mx-auto">
 
 <!-- section 0 (JP) -->
 
@@ -31,15 +36,15 @@ Enjoy the Jungle Paradise beach resort Zanzibar, a unique historical landscape w
 
 {% row(bgColor="#FFFFFF" margin="moderate" padding="none" id="fflow_grid") %}
 
-![](img/jungle2.jpeg)
+![](img/jungle2.jpeg#mx-auto)
 
 |||
 
-![](img/jungle7.jpeg)
+![](img/jungle7.jpeg#mx-auto)
 
 |||
 
-![](img/jungle4.jpeg)
+![](img/jungle4.jpeg#mx-auto)
 
 {% end %}
 
@@ -47,25 +52,16 @@ Enjoy the Jungle Paradise beach resort Zanzibar, a unique historical landscape w
 
 {% row(style="center narrow" bgColor="#FFFFFF" margin="moderate" padding="none" id="fflow_grid") %}
 
-<p>
 Today, this location is an operational eco-friendly boutique hotel in front of one of the absolute nicest beaches at this side of the island
-</p>
 
-<p>
 The resort is a quiet, beach-front jungle hideaway, a home to more than 280 different tree species (including 80  different types of palm trees).
-</p>
 
-<p>
 The resort is also the HQ of OurWorld Concept – an innovative approach to co-creating a better, more regenerative world. The resort will be used to come together with change makers from around the globe, in combination with our retreats on the Nile.
-</p>
 
-<p>
 The Mbweni Ruins & Gardens are unbelievably rich from a historical perspective. They are home to amazing ruins dating from 1870 – which are perfect for events and gatherings – and the plan is to transform the ruins back to their original glory.
-</p>
 
-<p>
 A healing center will be built and will host incredible technology (both ancient and new wisdom) for body, mind, and spirit . The therapies available are literally life saving or complete rejuvenation. 
- </p>
+ 
 
 {% end %}
 
@@ -80,60 +76,61 @@ A healing center will be built and will host incredible technology (both ancient
 
 {% row(style="center" bgColor="#FFFFFF" margin="moderate" padding="none" id="fflow_grid") %}
 
-![](img/jungle5.jpeg#large)
+![](img/jungle5.jpeg#mx-auto)
 
 |||
 
-![](img/jungle6.jpeg#large)
+![](img/jungle6.jpeg#mx-auto)
 
 {% end %}
 
 {% row(style="center" bgColor="#FFFFFF" margin="moderate" padding="bottom" id="fflow_grid") %}
 
-<p>
+
 Jungle Paradise Beach Resort & Spa at Mbweni Ruins is your ideal choice, if you want to see and enjoy a unique place in Zanzibar Urban West. It's well-known for their historical Mbweni ruins, which took part in the ending of slavery in Zanzibar in the 1870s. Jungle Paradise is surrounded by a beautiful botanic garden which supported over 600 different kinds of tree species. 
-</p>
+
 
 {% end %}
 
 {% row(style="center" bgColor="#FFFFFF" margin="moderate" padding="none" id="fflow_grid") %}
 
-![](img/jungle9.jpeg#large)
+![](img/jungle9.jpeg#mx-auto)
 
 |||
 
-![](img/jungle8.jpeg#large)
+![](img/jungle8.jpeg#mx-auto)
 
 {% end %}
 
 {% row(style="center" bgColor="#FFFFFF" margin="moderate" padding="none" id="fflow_grid") %}
 
-<p>
+
 Jungle paradise Beach Resort and Spa features 13 exclusive and cozy, air-conditioned beachfront Suites with a very high service standard. Each room provides a beautiful ocean-view, a private bathroom, Wi-Fi, a flat screen HD-TV with cable channels, a mini bar fridge and a balcony faced to the ocean, beach and pool area.
-</p>
+
 
 {% end %}
 
 {% row(style="center" bgColor="#FFFFFF" margin="moderate" padding="none" id="fflow_grid") %}
 
-![](img/jungle10.jpeg#large)
+![](img/jungle10.jpeg#mx-auto)
 
 |||
 
-![](img/jungle11.jpeg#large)
+![](img/jungle11.jpeg#mx-auto)
 
 {% end %}
 
 {% row(style="center" bgColor="#FFFFFF" margin="moderate" padding="none" id="fflow_grid") %}
 
-<p>
+
 You will enjoy a tasty menu at the beach-front restaurant while listening to calm chill out vibes and watching one of the best sunsets on this side of the island. You will find us 7 minutes close to the airport and 12 minutes from Stone town. This could be one of your best and memorable stay on Zanzibar.
-</p>
 
-{% end %}
 
-{% row(style="center narrow") %}
+<br>
 
 <button>[See More Locations](/locations)</button>
 
 {% end %}
+
+
+</div>

content/protection/botanrestorpro/index.md

@@ -8,7 +8,9 @@ weight: 4
 ---
 
 
-{% row(bgColor="#FFFFFF" margin="moderate" padding="bottom" id="botanical") %}
+{% row(margin="narrow" padding="both" id="botanical") %}
+
+<br>
 
 ### Mbweni Botanical Garden & Restoration Project
 
@@ -22,39 +24,16 @@ weight: 4
 
 |||
 
-![Mbweni](img/mbweniprotection4.jpg#large)
+![Mbweni](img/mbweniprotection4.jpg#mx-auto#medium)
 
-<br>
 
-![Mbweni](img/mbweniprotection1.jpeg#large)
 
-<br>
+![Mbweni](img/mbweniprotection1.jpeg#mx-auto#medium)
 
-![Mbweni](img/mbweniprotection5.jpg#large)
+
+
+![Mbweni](img/mbweniprotection5.jpg#mx-auto#medium)
 
 {% end %}
 
-{% row(bgColor="#F2F2F2" margin="moderate" padding="top" id="mangrove") %}
 
-![Mbweni Mangrove Beach](img/mangrove_beach.png#large)
-
-<br>
-
-![Mbweni Mangrove Beach](img/mbweni_mangrove.jpeg#large)
-
-
-|||
-
-### Mbweni Mangrove Beach
-
-​<p>​5200 Seedlings of Mangroves Replanted at Mbweni.</p>
-<br>
-<p>This effort helps the Wanawake Mazingira Group and a number of partners in assuring the desired goal of 10,000 Mangroves for 100 years of carbon offset.</p>
-<br>
-<p>Mbweni Mangrove forest is a vital periurban forest just at the edge of Dar es Salaam and Coastal region, and there is a degraded area as a result of El Nino of the late 1990s, where a lot of waterlogged at the mangroves and nearly 2 acres died.</p>
-<br>
-<p>We are restoring the degraded part of Mbweni mangrove forest with 10,000 Mangrove seedlings through community-based restoration, since March 2018 and up to the moment we have restored 5200 seedlings.</p>
-
-<br>
-
-{% end %}

content/protection/chumbeislandpro/index.md

@@ -7,22 +7,9 @@ draft: false
 weight: 4
 ---
 
-{% row(style="center narrow" margin="header" bgPath="img/protectheader.jpg" bgStyle="full") %}
-
-## Programs to Protect
-
-### A Regenerative Planet and People First Approach
-
-By creating our own paradise we have a responsibility to the planet.
-
-<br>
-<br>
-<br>
 <br>
 
-{% end %}
-
-{% row(bgColor="#FFFFFF" margin="moderate" padding="both" id="Invest") %}
+{% row(bgColor="#FFFFFF" margin="narrow" padding="both" id="Invest") %}
 
 ### Chumbe Island
 
@@ -44,6 +31,6 @@ Zanzibari community members from neighboring fishing villages will also gain kno
 
 |||
 
-![Chumbe](img/chumbeprotection.png#large)
+![Chumbe](img/chumbeprotection.png#mx-auto)
 
 {% end %}

content/protection/index.md

@@ -9,7 +9,9 @@ weight: 4
 
 <!-- section 1 (JP) -->
 
-{% row(style="center narrow" margin="header" bgPath="img/protectheader.jpg" 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
 
@@ -17,78 +19,75 @@ weight: 4
 
 By creating our own paradise we have a responsibility to the planet.
 
-<br>
-<br>
-<br>
-<br>
+</div>
 
 {% end %}
 
-{% row(bgColor="#FFFFFF" margin="moderate" padding="both" id="Invest") %}
+<div class="container mx-auto">
+
+{% row(style="reverse" bgColor="#FFFFFF" margin="moderate" padding="both" id="Invest") %}
 
 ### Chumbe Island
 
-<p>
 With OurParadise, we are initiating a series of conservation projects to preserve the marine and natural surroundings of Chumbe Island.
-</p>
 
-<button>[Read More](/protection/chumbeisland_pro)</button>
+<button>[Read More](/protection/chumbeislandpro)</button>
 
 |||
 
-![Chumbe](img/chumbeprotection.png#large)
+![Chumbe](img/chumbeprotection.png#mx-auto)
 
 {% end %}
 
+</div>
+
 <!-- section 2 (Fun beach) -->
 
-{% row(bgColor="#F2F2F2" margin="moderate" padding="bottom" id="ruins") %}
+{% row(bgColor="#F2F2F2" margin="tight" padding="both" id="ruins") %}
 
-![Ruins](img/mbweniruins3.jpeg#large)
+![Ruins](img/mbweniruins3.jpeg#mx-auto)
 
 |||
 
 ### Mbweni Ruins
 
-<p>Restoration Project for The Historic Ruins of the Mbweni School for freed slaves</p>
-<br>
+Restoration Project for The Historic Ruins of the Mbweni School for freed slaves
 
-<button>[Read More](/protection/mbweniruins_pro)</button>
+<button>[Read More](/protection/mbweniruinspro)</button>
 
 {% end %}
 
-{% row(bgColor="#FFFFFF" margin="moderate" padding="bottom" id="botanical") %}
+
+{% row(style="reverse" bgColor="#FFFFFF" margin="tight" padding="both" id="botanical") %}
 
 ### Mbweni Botanical Garden & Restoration Project
 
-<p>Conservation Project to preserve The gardens around the Mbweni ruins.</p>
-<br>
+Conservation Project to preserve The gardens around the Mbweni ruins.
 
-<button>[Read More](/protection/mbweniruins_pro)</button>
+<button>[Read More](/protection/botanrestorpro)</button>
 
 
 |||
 
-![Mbweni](img/mbweniprotection4.jpg#large)
+![Mbweni](img/mbweniprotection4.jpg#mx-auto)
 
 {% end %}
 
-{% row(bgColor="#F2F2F2" margin="moderate" padding="top" id="mangrove") %}
 
-![Mbweni Mangrove Beach](img/mangrove_beach.png#large)
+{% row(bgColor="#F2F2F2" margin="tight" padding="both" id="mangrove") %}
 
-<br>
+![Mbweni Mangrove Beach](img/mangrove_beach.png#mx-auto#medium)
 
-![Mbweni Mangrove Beach](img/mbweni_mangrove.jpeg#large)
+![Mbweni Mangrove Beach](img/mbweni_mangrove.jpeg#mx-auto#medium)
 
 
 |||
 
 ### Mbweni Mangrove Beach
 
-​<p>​Conservation project to 5200 Seedlings of Mangroves Replant Seedlings at Mbweni Mangrove.</p>
+Conservation project to 5200 Seedlings of Mangroves Replant Seedlings at Mbweni Mangrove.
 
-<button>[Read More](/protection/mbwenimangrove_pro)</button>
+<button>[Read More](/protection/mbwenimangrove)</button>
 
 {% end %}
 

content/protection/mbwenimangrove/index.md

@@ -0,0 +1,31 @@
+---
+title: "Protection"
+description: ""
+date: 2018-09-14
+updated: 2021-02-20
+draft: false
+weight: 4
+---
+
+
+{% row(bgColor="#F2F2F2" margin="narrow" id="mangrove" padding="both") %}
+
+<br>
+
+![Mbweni Mangrove Beach](img/mangrove_beach.png#mx-auto#medium)
+
+
+![Mbweni Mangrove Beach](img/mbweni_mangrove.jpeg#mx-auto#mediumo)
+
+
+|||
+
+### Mbweni Mangrove Beach
+
+​The Mbweni Mangrove Protection Program is a dedicated conservation initiative aimed at preserving the pristine beauty and ecological significance of Mbweni Mangrove Beach. With a focus on sustainability and restoration, the program has successfully replanted an impressive 5200 seedlings of mangroves, contributing to the preservation of this vital coastal ecosystem. Mangroves play a crucial role in coastal protection, acting as a natural barrier against erosion and storm surges while providing a habitat for various marine species. The Mbweni Mangrove Protection Program has not only nurtured these valuable seedlings but also raised awareness among local communities and visitors about the importance of mangrove conservation for the well-being of both the environment and the people.
+
+<br>
+
+Nestled in the heart of paradise, the Mbweni Mangrove Beach has become a beacon of hope for sustainable environmental practices and a model for successful conservation efforts. The tireless efforts of the Mbweni Mangrove Protection Program have fostered a thriving mangrove ecosystem, creating a sanctuary for diverse wildlife and enhancing the natural beauty of the beach. Through community engagement and collaborative partnerships, the program has not only revived the fragile mangrove habitat but also empowered local residents to take an active role in protecting their environment. As visitors to Mbweni Mangrove Beach, we have the unique opportunity to witness the positive impact of the program firsthand and become advocates for preserving this ecological gem for generations to come.
+
+{% end %}

content/protection/mbweniruins_pro/index.md

@@ -1,28 +0,0 @@
----
-title: "Protection"
-description: ""
-date: 2018-09-14
-updated: 2021-02-20
-draft: false
-weight: 4
----
-
-{% row(bgColor="#F2F2F2" margin="moderate" padding="bottom" id="ruins") %}
-
-![Ruins](img/mbweniruins3.jpeg#large)
-
-<br>
-
-![Ruins](img/mbweniruins2.jpeg#large)
-
-|||
-
-### Mbweni Ruins
-
-<p>The Historic Ruins of the Mbweni School for freed slaves founded in 1874, with associations with Sir John Kirk, Zanzibar’s first scientific botanist. Kirk (1832 – 1922) was also instrumental in the ending of the East African Slave Trade. He was resident in Zanzibar for 20 years from 1866-1886.</p>
-<br>
-<p>Near Mbweni Ruins is St John's Anglican Church, another thought-provoking reminder of the colonial missionary era. The caretaker-guide is a direct descendant of a freed slave who became the UMCA's first African deacon (junior priest).</p>
-<br>
-<p>Our aim is to restore the ruins to their old glory and revive it as an education center. We will also integrate the old church.</p>
-<br>
-{% end %}

content/protection/mbweniruinspro/index.md

@@ -0,0 +1,37 @@
+---
+title: "Protection"
+description: ""
+date: 2018-09-14
+updated: 2021-02-20
+draft: false
+weight: 8
+---
+
+
+
+{% row(bgColor="#F2F2F2" margin="narrow" padding="both" id="ruins") %}
+
+<br>
+
+![Ruins](img/mbweniruins3.jpeg#mx-auto#medium)
+
+
+![Ruins](img/mbweniruins2.jpeg#mx-auto#medium)
+
+|||
+
+### Mbweni Ruins
+
+The Historic Ruins of the Mbweni School for freed slaves founded in 1874, with associations with Sir John Kirk, Zanzibar’s first scientific botanist. Kirk (1832 – 1922) was also instrumental in the ending of the East African Slave Trade. He was resident in Zanzibar for 20 years from 1866-1886.
+
+<br>
+
+Near Mbweni Ruins is St John's Anglican Church, another thought-provoking reminder of the colonial missionary era. The caretaker-guide is a direct descendant of a freed slave who became the UMCA's first African deacon (junior priest).
+
+<br>
+
+Our aim is to restore the ruins to their old glory and revive it as an education center. We will also integrate the old church.
+
+<br>
+
+{% end %}

content/why/index.md

@@ -9,7 +9,9 @@ weight: 2
 
 <!-- section 1 (JP) -->
 
-{% row(style="center narrow" margin="header" bgPath="img/opwhy.jpg" 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">
 
 ## Our Why
 
@@ -21,4 +23,6 @@ These values are engrained into all that we do. Mother Earth is our home and we
 
 <button>[See Our Vision](/vision)</button>
 
+</div>
+
 {% end %}

css/index.css

@@ -85,7 +85,7 @@ img[src*="#fig"] {
 
 @layer components {
   h1 {
-    @apply text-3xl lg:text-5xl xl:text-7xl font-bold leading-none my-4;
+    @apply text-3xl lg:text-4xl font-bold leading-none my-4;
     font-family: "lato", sans-serif;
     line-height: 0.9;
     
@@ -94,7 +94,7 @@ img[src*="#fig"] {
     @apply font-medium;
   }
   h2 {
-    @apply text-3xl md:text-4xl lg:text-5xl xl:text-7xl font-bold leading-none my-4;
+    @apply text-3xl md:text-4xl lg:text-5xl font-bold leading-none my-4;
     font-family: "lato", sans-serif;
     line-height: 0.9;
     
@@ -136,7 +136,7 @@ img[src*="#fig"] {
     lg:text-lg
     px-8
     py-1
-    mr-5
+    lg:mr-5
     my-4
     border-2
     shadow
@@ -173,29 +173,31 @@ font-weight: 500;
     white-space: normal;
 }
 
-header .freeflow {
-    background-color: transparent;
-    position: absolute;
+header .customize {
+  background-color: transparent;
+  position: absolute;
 }
 
-footer .freeflow {
-    width: 100vw;
-    background-color: #FFFFFF;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 40px;
+footer .customize {
+  /* width: 100vw; */
+  background-color: #FFFFFF;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding-top: 40px;
+  padding-bottom: 40px;
+  
 }
 
-footer .freeflow img {
-    width: 60px;
+footer .customize img {
+  width: 125px;
 }
 
 
-header .freeflow div {
-    box-shadow: none;
-    text-transform: uppercase;
-    font-weight: 700 !important;
+header .customize div {
+  box-shadow: none;
+  text-transform: capitalize;
+  font-weight: 700 !important;
 }
 
 button {
@@ -355,10 +357,16 @@ header {
 .header:hover .back {
   transform: none;
 }
+
+a:hover {
+color: #636363;
+
+}
+
 @media (max-width: 768px) {
-  h2 {
-    font-size: 4rem;
-  }
+  /* h2 {
+    font-size: 3rem;
+  } */
 }
 @media (max-width: 640px) {
   .banner h2 {
@@ -380,7 +388,7 @@ header {
     padding: 80px 0;
   }
 
-  h2 {
-    font-size: 3rem;
-  }
+  /* h2 {
+    font-size: 2.5rem;
+  } */
 }

templates/partials/head.html

@@ -5,6 +5,7 @@
 {% set zolaVer = '0.13.0' %}
 
 <head>
+  <link rel="icon" type="image/x-icon" href="/images/favicon.png">
   <meta name="generator" content="Zola v.{{ zolaVer }} - getzola.org" />
 
   {% block title %}

templates/partials/header.html

@@ -12,7 +12,7 @@
 
     function toggleMenu(button) {
         if (displayedMenu === button.id.split("-")[0]) { 
-            button.className = button.className.replace(" text-blue-500 bg-stone-200 sm:bg-transparent", " text-gray-900");
+            button.className = button.className.replace(" text-green-500 bg-stone-200 sm:bg-transparent", " text-gray-900");
             hideMenu(button.id.split("-")[0]);
             button.lastElementChild.className = button.lastElementChild.className.replace("rotate-0", "-rotate-90")
             displayedMenu = "";
@@ -20,7 +20,7 @@
         else { 
             showMenu(button.id.split("-")[0]);
             button.lastElementChild.className = button.lastElementChild.className.replace("-rotate-90", "rotate-0")
-            button.className = button.className.replace(" text-gray-900", " text-blue-500 bg-stone-200 sm:bg-transparent");
+            button.className = button.className.replace(" text-gray-900", " text-green-500 bg-stone-200 sm:bg-transparent");
             displayedMenu = button.id.split("-")[0]
         }
     }
@@ -79,7 +79,7 @@
         buttons.forEach((button) => {
             button.addEventListener( 'click', function() { handleClick(button) });
         })
-        document.getElementById("mobile-learn-btn").addEventListener( 'click', toggleMenu);
+        //document.getElementById("mobile-learn-btn").addEventListener( 'click', toggleMenu);
     }
 
 </script>
@@ -97,33 +97,33 @@
 {% else %}
     <header id="header-container">
         {% set header_class = config.extra.header_class | default(value='') %}
-        <div class="{{'z-10 bg-white fixed w-screen ' ~ header_class}}">
+        <div class="{{'z-10 header_BG fixed w-screen max-w-full ' ~ header_class}}">
             <div class="relative z-50 shadow">
             <div class="mx-auto flex z-50 shadow justify-between items-center pl-6 pr-2 md:pr-0 lg:py-5  md:px-12 py-2 lg:px-20 lg:justify-start lg:space-x-20">
                 <div>
                     <a href="/" class="flex">
-                        <img class="w-56 h-auto sm:w-15" src="{{logo_path}}" alt="FreeFlow Logo" />
+                        <img class="logo" src="{{logo_path}}" alt="Logo" />
                     </a>
                 </div>
                 <div class="-mr-2 -my-2 lg:hidden">
-                    <button id="hamburger-btn" type="button" class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2">
+                    <button id="hamburger-btn" type="button" class="mr-4 inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2">
                         <!-- Heroicon name: menu -->
-                        <svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <svg class="h-6 w-6 text-black" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" />
                         </svg>
                     </button>
-                <button id="close-hamburger-btn" type="button" class="hidden lg:hidden inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2">
+                <button id="close-hamburger-btn" type="button" class="hidden mr-4 lg:hidden inline-flex mr-4 items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2">
                     <!-- Heroicon name: x -->
-                    <svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                    <svg class="h-6 w-6 text-black" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
                     </svg>
                     </button>
                 </div>
                 <div class="hidden lg:flex-1 lg:flex lg:items-center lg:justify-end lg:space-x-12">
-                    <nav class="flex space-x-10">    
+                    <nav class="flex space-x-6">    
                     {% for page in section.pages %}
                     {% if page.extra.menu %} {% continue %} {% endif %}
-                        <a href="{{page.permalink}}" class="text-lg leading-6 text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
+                        <a href="{{page.permalink}}" class="text-lg uppercase font-semibold leading-6 text-black focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
                             {{page.title}}
                         </a>
                         <div class="relative">
@@ -133,7 +133,7 @@
                         {% if subsection == "footer/_index.md" %} {% continue %} {% endif %}                        
                         {% set button_id = subsection ~ "-menu-btn" | slugify %}
                         <div class="relative">
-                        <button type="button" id="{{button_id}}" class="nav_btn text-gray-900 group inline-flex items-center space-x-2 text-lg leading-6 hover:text-blue-300 focus:outline-none transition ease-in-out duration-150">
+                        <button type="button" id="{{button_id}}" class="nav_btn text-gray-900 group inline-flex items-center space-x-2 text-lg leading-6 hover:text-green-300 focus:outline-none transition ease-in-out duration-150">
                             <span>{{ subsection }}</span>
                             <div class="-rotate-90 transition-transform"><svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"/></svg></div>
                         </button>
@@ -173,7 +173,7 @@
         <div id="hamburger" class="hidden fixed mt-16 z-20 top-0 inset-x-0 transition transform origin-top-right lg:hidden">
             <div>
                 <div class="shadow-xs h-screen bg-white divide-y-2 divide-gray-50">
-                    <div class="pb-6 sm:px-12 md:px-16 lg:px-20 space-y-6 sm:space-y-8 sm:pb-8 max-h-screen overflow-y-auto">
+                    <div class="pt-6 sm:px-12 md:px-16 lg:px-20 space-y-6 sm:space-y-8 sm:pb-8 max-h-screen overflow-y-auto">
     
                         <nav class="flex flex-col justify-around pb-12">
                         {% for page in section.pages %}
@@ -224,3 +224,8 @@
 {% endif %}
 
 
+<style>
+    .logo{
+    width: 250px;
+}
+</style>

templates/shortcodes/row.html

@@ -54,70 +54,19 @@ Parameters:
 
 {% endif %}
 
-<!-- Padding -->
-
-{% set padding_class = " py-8 md:py-8 lg:py-28" %}
-
-{% if padding %}
-    {% if "none" in padding %}
-        {% set padding_class = " py-0" %}
-    {% elif "top" in padding %}
-        {% set padding_class = " py-2 md:py-4 lg:pt-28" %}
-    {% elif "bottom" in padding %}
-        {% set padding_class = " py-2 md:py-4 lg:pb-28" %}
-    {% endif %}
-{% endif %}
-
-{% if css %}
-    {% set padding_class = padding_class ~ " " ~ css %}
-{% endif %}
-
-{% set row_class =  row_class ~ padding_class %}
 
 
-<!-- Margins -->
-
-{% set margin_class = " mx-4 md:mx-16 lg:mx-24" %}
-
-{% if margin %}
-    {% if "none" in margin %}
-        {% set margin_class = " mx-0" %}
-    {% elif "wide" in margin %}
-        {% set margin_class = " mx-4 sm:mx-8 md:mx-12 lg:mx-16 xl:mx-20" %}
-    {% elif "moderate" in margin %}
-        {% set margin_class = " mx-8 sm:mx-16 md:mx-20 lg:mx-28" %}
-    {% elif "narrow" in margin %}
-        {% set margin_class = " mx-12 sm:mx-20 md:mx-28 lg:mx-40" %}
-    {% elif "tight" in margin %}
-        {% set margin_class = " mx-20 sm:mx-32 md:mx-40 lg:mx-80 xl:mx-96" %}
-    {% elif "header" in margin %}
-        {% set margin_class = " mx-12 sm:mx-20 md:mx-28 lg:mx-40 my-10" %}
-    {% endif %}
-    {% if "lean-left" in margin %}
-        {% set margin = margin_class | replace(from=" ", to=" first:")%}
-        {% set margin_left = margin | replace(from="mx", to="-ml") %}
-        {% set margin_right = margin | replace(from="mx", to="mr") %}
-        {% set col_class = col_class ~ " md:last:px-8 lg:last:px-20 lg:max-w-[50%] lg:mx-0 " ~ margin_left ~ margin_right %}
-        {% set row_class = row_class ~ " sm:gap-0 " %}
-    {% elif "lean-right" in margin %}
-        {% set margin = margin_class | replace(from=" ", to=" last:")%}
-        {% set margin_left = margin | replace(from="mx", to="ml") %}
-        {% set margin_right = margin | replace(from="mx", to="-mr") %}
-        {% set col_class = col_class ~ " md:first:px-8  lg:first:px-20 lg:max-w-[50%] lg:mx-0 " ~ margin_left ~ margin_right %}
-        {% set row_class = row_class ~ " sm:gap-0 " %}
-    {% endif %}
-{% endif %}
-
-{% if css %}
-    {% set margin_class = margin_class ~ " " ~ css %}
-{% endif %}
-
-{% set row_class =  row_class ~ margin_class %}
 
 {% if style %}
 
+ <!-- reverse col at mobile -->
+
+ {% if "reverse" in style %}
+ {% set row_class = "flex flex-col-reverse md:flex-row items-center" %}
+ {% endif %}
+
     {% if "center" in style %}
-        {% set row_class = row_class ~ " text-center items-center mx-auto " %}
+        {% set row_class = row_class ~ " text-center items-center" %}
         {% set col_class = col_class ~ " flex-1 " %}
     {% endif %}
 
@@ -156,6 +105,65 @@ Parameters:
     {% set anchor_link = anchor %}
 {% endif %}
 
+<!-- Padding -->
+
+{% set padding_class = " py-8 md:py-8 lg:py-28" %}
+
+{% if padding %}
+    {% if "none" in padding %}
+        {% set padding_class = " py-0" %}
+    {% elif "top" in padding %}
+        {% set padding_class = " py-2 md:py-4 lg:pt-28" %}
+    {% elif "bottom" in padding %}
+        {% set padding_class = " py-2 md:py-4 lg:pb-28" %}
+    {% endif %}
+{% endif %}
+
+{% if css %}
+    {% set padding_class = padding_class ~ " " ~ css %}
+{% endif %}
+
+{% set row_class =  row_class ~ padding_class %}
+
+
+<!-- Margins -->
+
+{% set margin_class = " mx-4 md:mx-16 lg:mx-24" %}
+
+{% if margin %}
+    {% if "none" in margin %}
+        {% set margin_class = " mx-0" %}
+    {% elif "wide" in margin %}
+        {% set margin_class = " mx-4 md:mx-12 lg:mx-16 xl:mx-20" %}
+    {% elif "moderate" in margin %}
+        {% set margin_class = " mx-4 md:mx-20 lg:mx-28" %}
+    {% elif "narrow" in margin %}
+        {% set margin_class = " mx-4 md:mx-28 lg:mx-40" %}
+    {% elif "tight" in margin %}
+        {% set margin_class = " mx-4 md:mx-40 lg:mx-80 xl:mx-96" %}
+    {% elif "header" in margin %}
+        {% set margin_class = " mx-4 md:mx-28 lg:mx-40 my-10" %}
+    {% endif %}
+    {% if "lean-left" in margin %}
+        {% set margin = margin_class | replace(from=" ", to=" first:")%}
+        {% set margin_left = margin | replace(from="mx", to="-ml") %}
+        {% set margin_right = margin | replace(from="mx", to="mr") %}
+        {% set col_class = col_class ~ " md:last:px-8 lg:last:px-20 lg:max-w-[50%] lg:mx-0 " ~ margin_left ~ margin_right %}
+        {% set row_class = row_class ~ " sm:gap-0 " %}
+    {% elif "lean-right" in margin %}
+        {% set margin = margin_class | replace(from=" ", to=" last:")%}
+        {% set margin_left = margin | replace(from="mx", to="ml") %}
+        {% set margin_right = margin | replace(from="mx", to="-mr") %}
+        {% set col_class = col_class ~ " md:first:px-8  lg:first:px-20 lg:max-w-[50%] lg:mx-0 " ~ margin_left ~ margin_right %}
+        {% set row_class = row_class ~ " sm:gap-0 " %}
+    {% endif %}
+{% endif %}
+
+{% if css %}
+    {% set margin_class = margin_class ~ " " ~ css %}
+{% endif %}
+
+{% set row_class =  row_class ~ margin_class %}
 
 <!-- makes row full screen width and adds background img -->
 {% set styles = ""  %}
@@ -195,7 +203,7 @@ Parameters:
 {% set no_margins = " -mx-8 md:-mx-12 lg:-mx-16 xl:-mx-20" %}
 
 
-        <div id="{{anchor_link}}" class="{{'relative justify-center flex overflow-hidden ' ~ div_class }}" style="{{styles}}">
+        <div id="{{anchor_link}}" class="{{'relative justify-center items-center flex overflow-hidden ' ~ div_class }}" style="{{styles}}">
             <div id="{{row_id}}" class="{{row_class}}" style="min-width: -webkit-fill-available; min-width: -moz-available"> 
         
         {% for column in columns%}