diff --git a/README.md b/README.md index 71480a5..685e5fe 100644 --- a/README.md +++ b/README.md @@ -1,106 +1,44 @@ -# OUR PARADISE Website (Updated) +# Welcome to Eden Website Repository -website on https://zanzibar.ourworld.tf +## About -## Developers +The official website of Eden: A Co-Living Community for Change-Makers & Digital Nomads -A website created using Zola, a static site generator. +[https://zanzibar.ourworld.tf/](https://zanzibar.ourworld.tf/) -- 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 +Last Updated: March 2023 -### Getting Started +## Contribution -This repository is meant to use as a template for static sites. +Feel free to [create a new issue](https://github.com/ourworld-tsc/www_ourparadise_new/issues) to report an error on the website, or if you have any suggestions on website improvements. -To use this repository as a template, simply: +## Administrators +[ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin) -- 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` +## Direct Contribution Procedure -### How to create pages using this template +![readme](https://user-images.githubusercontent.com/43240801/236867088-56c95abd-510c-4202-b0c5-317cdfb75cb3.png) -#### Structure of the content directory +It is highly important to follow this procedure to contribute to the website content.
+__WARNING__: DO NOT commit straight into __master__ / __development__ branch. -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. +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. -Ex: -content/\_index.md -> yoururl.com/ -content/blog/\_index.md -> yoururl.com/blog -content/careers/index.md or content/careers.md -> yoururl.com/careers +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. -#### Section Templates +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. -##### Blog.html +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. -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. +7. When PR is approved, you can see your changes on staging env on www2.threefold.io (development 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. +8. Admin will then create a PR to merge 'development' into into '**master**' (production 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. +10. When PR is approved, you can see your changes live on production (master branch). -##### 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) diff --git a/config.toml b/config.toml index 0fc0948..a232ada 100644 --- a/config.toml +++ b/config.toml @@ -2,8 +2,8 @@ base_url = "https://zanzibar.ourworld.tf/" # Change this to your own URL! Please note this variable **must** be uncommented. -title = "OurParadise" -description="OurParadise Project, strive to protect." +title = "Eden" +description="Eden Project, strive to protect." # When set to "true", a feed is automatically generated. # generate_feed = true @@ -67,5 +67,5 @@ paginate_by = 2 paginate_path = "blog-posts" [extra] -header_class = "freeflow" -footer_class = "freeflow" +header_class = "customize" +footer_class = "customize" diff --git a/content/_index.md b/content/_index.md index d972ab5..94f61d8 100644 --- a/content/_index.md +++ b/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 --- diff --git a/content/about/img/manifesto.png b/content/about/img/manifesto.png index 8f6e520..10b3396 100644 Binary files a/content/about/img/manifesto.png and b/content/about/img/manifesto.png differ diff --git a/content/about/img/opwhy.jpg b/content/about/img/opwhy.jpg index c3c32bf..fedcab5 100644 Binary files a/content/about/img/opwhy.jpg and b/content/about/img/opwhy.jpg differ diff --git a/content/about/img/our_why.png b/content/about/img/our_why.png index 0596275..59af091 100644 Binary files a/content/about/img/our_why.png and b/content/about/img/our_why.png differ diff --git a/content/about/img/purpose.jpg b/content/about/img/purpose.jpg index 256bfa2..35f7164 100644 Binary files a/content/about/img/purpose.jpg and b/content/about/img/purpose.jpg differ diff --git a/content/about/index.md b/content/about/index.md index 5419fe2..23a916f 100644 --- a/content/about/index.md +++ b/content/about/index.md @@ -9,7 +9,9 @@ weight: 2 -{% row(style="center narrow" margin="header" bgPath="img/opwhy.jpg" bgStyle="full") %} +{% row(style="center narrow" margin="tight" bgPath="img/opwhy.jpg" bgStyle="full") %} + +
## 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. -
-
-
-
-
-
+
{% 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 -

We aim to provide a space in which people feel at home and can create, live, work, heal, taste, learn, and experience. OurParadise 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.)

+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** @@ -108,7 +105,7 @@ Primarily we are focused on building **[a decentralized Internet](https://threef ### Our Manifesto -

OurParadise is a home for all of us. A laid-back no frills environment that allows us to slow down, get back in touch with mother nature, and with ourselves. OurParadise is a raw and safe space for collaboration and co-creation, for imagination and celebration.

+

Eden is a home for all of us. A laid-back no frills environment that allows us to slow down, get back in touch with mother nature, and with ourselves. Eden is a raw and safe space for collaboration and co-creation, for imagination and celebration.

- We say hello to each other and offer a warm smile - We treat each other with kindness and do not discriminate @@ -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 %} \ No newline at end of file diff --git a/content/action/img/educationheader.jpg b/content/action/img/educationheader.jpg index 9ef7bc5..00b5046 100644 Binary files a/content/action/img/educationheader.jpg and b/content/action/img/educationheader.jpg differ diff --git a/content/action/img/nonprofit.jpg b/content/action/img/nonprofit.jpg index 2fc88b3..c5119a6 100644 Binary files a/content/action/img/nonprofit.jpg and b/content/action/img/nonprofit.jpg differ diff --git a/content/action/img/paradise.jpeg b/content/action/img/paradise.jpeg index 3859817..f40c1a2 100644 Binary files a/content/action/img/paradise.jpeg and b/content/action/img/paradise.jpeg differ diff --git a/content/action/img/token_ownership.jpg b/content/action/img/token_ownership.jpg index 1f239e8..b38a464 100644 Binary files a/content/action/img/token_ownership.jpg and b/content/action/img/token_ownership.jpg differ diff --git a/content/action/index.md b/content/action/index.md index b0d8812..fbec89a 100644 --- a/content/action/index.md +++ b/content/action/index.md @@ -7,23 +7,22 @@ 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") %} + +
## 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. -
-
-
-
+
{% 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 EDEN. EDEN Tokens are not crypto currencies, they are pre-purchase tokens of OurParadise and represent ownership/utilization in the ecosystem. You can always re-sell your EDEN tokens or use them to participate in the OurParadise 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 %} @@ -43,7 +42,7 @@ We are introducing a token called EDEN. EDEN Tokens are not crypto currencies, t # Not For Profit -The OurParadise locations will be owned by not-for-profit entities to make sure that all stays protected for ever. All assets are owned by non profits but the utilization is 100% for OurParadise for 33-66-99 years (renewable). This allows us to create value for the future of our planet and ourselves. +The Eden locations will be owned by not-for-profit entities to make sure that all stays protected for ever. All assets are owned by non profits but the utilization is 100% for Eden for 33-66-99 years (renewable). This allows us to create value for the future of our planet and ourselves. ||| @@ -59,7 +58,7 @@ The OurParadise locations will be owned by not-for-profit entities to make sure # A Bigger Picture -OurParadise is part of a much bigger picture focused on planet and people first principles. We collectively believe that doing business and doing good for the world can go hand in hand. +Eden is part of a much bigger picture focused on planet and people first principles. We collectively believe that doing business and doing good for the world can go hand in hand. diff --git a/content/activities/boats/img/activities_boats.png b/content/activities/boats/img/activities_boats.png index 24b6aa1..0ed4f9f 100644 Binary files a/content/activities/boats/img/activities_boats.png and b/content/activities/boats/img/activities_boats.png differ diff --git a/content/activities/chumbe/img/activities_chumbe.jpeg b/content/activities/chumbe/img/activities_chumbe.jpeg index 20f32e5..5800ade 100644 Binary files a/content/activities/chumbe/img/activities_chumbe.jpeg and b/content/activities/chumbe/img/activities_chumbe.jpeg differ diff --git a/content/activities/crafts/index.md b/content/activities/crafts/index.md index 3cbbd77..fc0826e 100644 --- a/content/activities/crafts/index.md +++ b/content/activities/crafts/index.md @@ -13,7 +13,7 @@ weight: 6 ### Activities -As part of our aim to support local people and preserve Zanzibari culture, we are inviting artists and skilled craftsmen and women from the island to share their knowledge with OurParadise visitors. +As part of our aim to support local people and preserve Zanzibari culture, we are inviting artists and skilled craftsmen and women from the island to share their knowledge with Eden visitors. diff --git a/content/activities/gardens/img/activities_gardens.png b/content/activities/gardens/img/activities_gardens.png index f6f44a7..513ab76 100644 Binary files a/content/activities/gardens/img/activities_gardens.png and b/content/activities/gardens/img/activities_gardens.png differ diff --git a/content/activities/img/activities_header.png b/content/activities/img/activities_header.png index 2c2af97..431b037 100644 Binary files a/content/activities/img/activities_header.png and b/content/activities/img/activities_header.png differ diff --git a/content/activities/img/activities_header_2.png b/content/activities/img/activities_header_2.png index f675fe1..99f8724 100644 Binary files a/content/activities/img/activities_header_2.png and b/content/activities/img/activities_header_2.png differ diff --git a/content/activities/img/boats.png b/content/activities/img/boats.png index d5cef6e..13021dd 100644 Binary files a/content/activities/img/boats.png and b/content/activities/img/boats.png differ diff --git a/content/activities/img/gardens.png b/content/activities/img/gardens.png index e855fb2..adb2900 100644 Binary files a/content/activities/img/gardens.png and b/content/activities/img/gardens.png differ diff --git a/content/activities/img/mangroves.png b/content/activities/img/mangroves.png index a0bf8e3..0fa069c 100644 Binary files a/content/activities/img/mangroves.png and b/content/activities/img/mangroves.png differ diff --git a/content/activities/img/relax.png b/content/activities/img/relax.png index db87faf..93e9ead 100644 Binary files a/content/activities/img/relax.png and b/content/activities/img/relax.png differ diff --git a/content/activities/img/ruins.png b/content/activities/img/ruins.png index b20cd36..20497de 100644 Binary files a/content/activities/img/ruins.png and b/content/activities/img/ruins.png differ diff --git a/content/activities/index.md b/content/activities/index.md index 3ee72a7..9b9b9fc 100644 --- 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_2.png" bgStyle="full") %} +{% row(style="center narrow" margin="tight" bgPath="img/activities_header_2.png" bgStyle="full") %} + +
## 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. -
-
-
-
-
-
+
{% end %} diff --git a/content/activities/indulge/index.md b/content/activities/indulge/index.md index d218cae..42ffe70 100644 --- a/content/activities/indulge/index.md +++ b/content/activities/indulge/index.md @@ -13,7 +13,7 @@ weight: 6 ### Activities -We want to demonstrate that healthy food can also be super nice. OurParadise will feature healthy restaurants showcasing local, fresh, and sustainably-produced ingredients, whenever possible. In the future, we will look to grow our own fruits and vegetables and source items like eggs directly from our property. +We want to demonstrate that healthy food can also be super nice. Eden will feature healthy restaurants showcasing local, fresh, and sustainably-produced ingredients, whenever possible. In the future, we will look to grow our own fruits and vegetables and source items like eggs directly from our property. diff --git a/content/activities/mangroves/img/activities_mangroves.png b/content/activities/mangroves/img/activities_mangroves.png index 121c012..2cfc9b4 100644 Binary files a/content/activities/mangroves/img/activities_mangroves.png and b/content/activities/mangroves/img/activities_mangroves.png differ diff --git a/content/activities/relax/img/activities_relax.png b/content/activities/relax/img/activities_relax.png index 805d9b0..368c246 100644 Binary files a/content/activities/relax/img/activities_relax.png and b/content/activities/relax/img/activities_relax.png differ diff --git a/content/activities/relax/index.md b/content/activities/relax/index.md index 651a528..ca74c79 100644 --- a/content/activities/relax/index.md +++ b/content/activities/relax/index.md @@ -13,7 +13,7 @@ weight: 6 ### Activities -Part of our aim is to help people find themselves in this hectic world. OurParadise is a perfect place to relax and unwind. Spend your day soaking in the sun on our mangrove-lined 150 meter-long beach or by the pool. Wind down with a perfect view of sunset from our restaurant or bar. +Part of our aim is to help people find themselves in this hectic world. Eden is a perfect place to relax and unwind. Spend your day soaking in the sun on our mangrove-lined 150 meter-long beach or by the pool. Wind down with a perfect view of sunset from our restaurant or bar. diff --git a/content/activities/ruins/img/activities_ruins.png b/content/activities/ruins/img/activities_ruins.png index 45f38f1..a7b33d6 100644 Binary files a/content/activities/ruins/img/activities_ruins.png and b/content/activities/ruins/img/activities_ruins.png differ diff --git a/content/header/index.md b/content/header/index.md deleted file mode 100644 index 8c37e07..0000000 --- a/content/header/index.md +++ /dev/null @@ -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() %} - - - -||| - - - -||| - - - -{% end %} - -- MoreInfo - -{% row(style="wide") %} - - -#### Tools - - - - - - - - - - - - - - - - - -{% end %} \ No newline at end of file diff --git a/content/home/img/activities_big.png b/content/home/img/activities_big.png index cb076a8..d57c353 100644 Binary files a/content/home/img/activities_big.png and b/content/home/img/activities_big.png differ diff --git a/content/home/img/coown_big.png b/content/home/img/coown_big.png index 85b0603..33e3ecb 100644 Binary files a/content/home/img/coown_big.png and b/content/home/img/coown_big.png differ diff --git a/content/home/img/location_big.jpg b/content/home/img/location_big.jpg index c870124..9ae067b 100644 Binary files a/content/home/img/location_big.jpg and b/content/home/img/location_big.jpg differ diff --git a/content/home/img/new_home.png b/content/home/img/new_home.png index 0827a96..3ddcea2 100644 Binary files a/content/home/img/new_home.png and b/content/home/img/new_home.png differ diff --git a/content/home/img/protection_big.jpg b/content/home/img/protection_big.jpg index 08a1c94..ce3b7ed 100644 Binary files a/content/home/img/protection_big.jpg and b/content/home/img/protection_big.jpg differ diff --git a/content/home/index.md b/content/home/index.md index 08ab5ba..c2f380e 100644 --- a/content/home/index.md +++ b/content/home/index.md @@ -9,9 +9,11 @@ weight: 1 -{% row(style="center narrow" margin="header" bgPath="img/new_home.png" bgStyle="full") %} +{% row(style="center narrow" margin="tight" bgPath="img/new_home.png" bgStyle="full") %} -## Welcome to OurParadise +
+ +## Welcome to Eden ### A Co-Living Community for Change-Makers & Digital Nomads @@ -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.* +
+ {% end %}
-{% row(style="center narrow" margin="header" bgPath="img/ruins_big.jpg" bgStyle="full") %} +{% row(style="center narrow" margin="tight" bgPath="img/ruins_big.jpg" bgStyle="full") %} + +
## [About](/about) Learn more about our project and who we are. +
+ {% end %}
-{% row(style="center narrow" margin="header" bgPath="img/location_big.jpg" bgStyle="full") %} +{% row(style="center narrow" margin="tight" bgPath="img/location_big.jpg" bgStyle="full") %} + +
## [Location](/location) Get to know where we are and its history. +
+ {% end %}
-{% row(style="center narrow" margin="header" bgPath="img/activities_big.png" bgStyle="full") %} +{% row(style="center narrow" margin="tight" bgPath="img/activities_big.png" bgStyle="full") %} + +
## [Activities](/activities) Find out what paradise has to offer. +
+ {% end %}
-{% row(style="center narrow" margin="header" bgPath="img/protection_big.jpg" bgStyle="full") %} +{% row(style="center narrow" margin="tight" bgPath="img/protection_big.jpg" bgStyle="full") %} + +
## [Protection](/protection) Discover how we aim to preserve this place. +
+ {% end %}
-{% row(style="center narrow" margin="header" bgPath="img/coown_big.png" bgStyle="full") %} +{% row(style="center narrow" margin="tight" bgPath="img/coown_big.png" bgStyle="full") %} + +
## [Action](/action) + Get involved in turning dream into reality. +
+ {% end %} \ No newline at end of file diff --git a/content/location/chumbe/img/accommodatie-zanzibar-chumbe-island-coral-park00006.jpeg b/content/location/chumbe/img/accommodatie-zanzibar-chumbe-island-coral-park00006.jpeg index 352d52e..8e8e4f1 100644 Binary files a/content/location/chumbe/img/accommodatie-zanzibar-chumbe-island-coral-park00006.jpeg and b/content/location/chumbe/img/accommodatie-zanzibar-chumbe-island-coral-park00006.jpeg differ diff --git a/content/location/chumbe/img/chumbe1.jpeg b/content/location/chumbe/img/chumbe1.jpeg index 934a244..74f3009 100644 Binary files a/content/location/chumbe/img/chumbe1.jpeg and b/content/location/chumbe/img/chumbe1.jpeg differ diff --git a/content/location/img/luxury.jpeg b/content/location/img/luxury.jpeg index 67dd5f4..228a3a0 100644 Binary files a/content/location/img/luxury.jpeg and b/content/location/img/luxury.jpeg differ diff --git a/content/location/img/mbwenilocation1.jpeg b/content/location/img/mbwenilocation1.jpeg index 6c35a29..425a7c0 100644 Binary files a/content/location/img/mbwenilocation1.jpeg and b/content/location/img/mbwenilocation1.jpeg differ diff --git a/content/location/img/mbwenilocation2.jpeg b/content/location/img/mbwenilocation2.jpeg index 4ee722e..e394d73 100644 Binary files a/content/location/img/mbwenilocation2.jpeg and b/content/location/img/mbwenilocation2.jpeg differ diff --git a/content/location/img/mbwenilocation3.jpeg b/content/location/img/mbwenilocation3.jpeg index de4ebba..74443a5 100644 Binary files a/content/location/img/mbwenilocation3.jpeg and b/content/location/img/mbwenilocation3.jpeg differ diff --git a/content/location/img/mbweniprotection1.jpeg b/content/location/img/mbweniprotection1.jpeg index 6c35a29..425a7c0 100644 Binary files a/content/location/img/mbweniprotection1.jpeg and b/content/location/img/mbweniprotection1.jpeg differ diff --git a/content/location/img/mbweniprotection2.jpeg b/content/location/img/mbweniprotection2.jpeg index 4ee722e..e394d73 100644 Binary files a/content/location/img/mbweniprotection2.jpeg and b/content/location/img/mbweniprotection2.jpeg differ diff --git a/content/location/img/mbweniprotection3.jpeg b/content/location/img/mbweniprotection3.jpeg index de4ebba..74443a5 100644 Binary files a/content/location/img/mbweniprotection3.jpeg and b/content/location/img/mbweniprotection3.jpeg differ diff --git a/content/location/img/zanzibarvillas.jpeg b/content/location/img/zanzibarvillas.jpeg index a5d169a..0be3dd8 100644 Binary files a/content/location/img/zanzibarvillas.jpeg and b/content/location/img/zanzibarvillas.jpeg differ diff --git a/content/location/index.md b/content/location/index.md index f0a8f9c..af9425d 100644 --- a/content/location/index.md +++ b/content/location/index.md @@ -8,7 +8,9 @@ weight: 3 --- -{% row(style="center narrow" margin="header" bgPath="img/luxury.jpeg" bgStyle="full") %} +{% row(style="center narrow" margin="tight" bgPath="img/luxury.jpeg" bgStyle="full") %} + +
## Our Location @@ -18,12 +20,7 @@ You can find us on the west coast of Zanzibar, alongside 150 meters of mangrove- -
-
-
-
-
-
+
{% 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. - + ||| -![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. - + {% 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** diff --git a/content/location/mbweni/img/jungle11.jpeg b/content/location/mbweni/img/jungle11.jpeg index 68d04ea..e269f88 100644 Binary files a/content/location/mbweni/img/jungle11.jpeg and b/content/location/mbweni/img/jungle11.jpeg differ diff --git a/content/location/mbweni/img/jungle4.jpeg b/content/location/mbweni/img/jungle4.jpeg index 4ee722e..e394d73 100644 Binary files a/content/location/mbweni/img/jungle4.jpeg and b/content/location/mbweni/img/jungle4.jpeg differ diff --git a/content/location/mbweni/img/mbwenilocation1.jpeg b/content/location/mbweni/img/mbwenilocation1.jpeg index 6c35a29..425a7c0 100644 Binary files a/content/location/mbweni/img/mbwenilocation1.jpeg and b/content/location/mbweni/img/mbwenilocation1.jpeg differ diff --git a/content/location/mbweni/img/mbwenilocation2.jpeg b/content/location/mbweni/img/mbwenilocation2.jpeg index 4ee722e..e394d73 100644 Binary files a/content/location/mbweni/img/mbwenilocation2.jpeg and b/content/location/mbweni/img/mbwenilocation2.jpeg differ diff --git a/content/location/mbweni/img/mbwenilocation3.jpeg b/content/location/mbweni/img/mbwenilocation3.jpeg index de4ebba..74443a5 100644 Binary files a/content/location/mbweni/img/mbwenilocation3.jpeg and b/content/location/mbweni/img/mbwenilocation3.jpeg differ diff --git a/content/location/mbweni/img/mbweniprotection1.jpeg b/content/location/mbweni/img/mbweniprotection1.jpeg index 6c35a29..425a7c0 100644 Binary files a/content/location/mbweni/img/mbweniprotection1.jpeg and b/content/location/mbweni/img/mbweniprotection1.jpeg differ diff --git a/content/location/mbweni/img/mbweniprotection2.jpeg b/content/location/mbweni/img/mbweniprotection2.jpeg index 4ee722e..e394d73 100644 Binary files a/content/location/mbweni/img/mbweniprotection2.jpeg and b/content/location/mbweni/img/mbweniprotection2.jpeg differ diff --git a/content/location/mbweni/img/mbweniprotection3.jpeg b/content/location/mbweni/img/mbweniprotection3.jpeg index de4ebba..74443a5 100644 Binary files a/content/location/mbweni/img/mbweniprotection3.jpeg and b/content/location/mbweni/img/mbweniprotection3.jpeg differ diff --git a/content/protection/img/mbweniprotection1.jpeg b/content/protection/img/mbweniprotection1.jpeg index 6c35a29..425a7c0 100644 Binary files a/content/protection/img/mbweniprotection1.jpeg and b/content/protection/img/mbweniprotection1.jpeg differ diff --git a/content/protection/img/mbweniprotection2.jpeg b/content/protection/img/mbweniprotection2.jpeg index 4ee722e..e394d73 100644 Binary files a/content/protection/img/mbweniprotection2.jpeg and b/content/protection/img/mbweniprotection2.jpeg differ diff --git a/content/protection/img/mbweniprotection3.jpeg b/content/protection/img/mbweniprotection3.jpeg index de4ebba..74443a5 100644 Binary files a/content/protection/img/mbweniprotection3.jpeg and b/content/protection/img/mbweniprotection3.jpeg differ diff --git a/content/protection/img/mbweniprotection4.jpg b/content/protection/img/mbweniprotection4.jpg index 426c192..231feb8 100644 Binary files a/content/protection/img/mbweniprotection4.jpg and b/content/protection/img/mbweniprotection4.jpg differ diff --git a/content/protection/img/mbweniprotection5.jpg b/content/protection/img/mbweniprotection5.jpg index 732a891..f84bd2f 100644 Binary files a/content/protection/img/mbweniprotection5.jpg and b/content/protection/img/mbweniprotection5.jpg differ diff --git a/content/protection/img/mbweniruins2.jpeg b/content/protection/img/mbweniruins2.jpeg index 65b9a0a..94ed109 100644 Binary files a/content/protection/img/mbweniruins2.jpeg and b/content/protection/img/mbweniruins2.jpeg differ diff --git a/content/protection/index.md b/content/protection/index.md index 833128a..5d10411 100644 --- a/content/protection/index.md +++ b/content/protection/index.md @@ -9,7 +9,9 @@ weight: 4 -{% row(style="center narrow" margin="header" bgPath="img/protectheader.jpg" bgStyle="full") %} +{% row(style="center narrow" margin="tight" bgPath="img/protectheader.jpg" bgStyle="full") %} + +
## Programs to Protect @@ -19,12 +21,7 @@ By creating our own paradise we have a responsibility to the planet. Most of the -
-
-
-
-
-
+
{% end %} @@ -91,7 +88,7 @@ By creating our own paradise we have a responsibility to the planet. Most of the ### Chumbe Island Preservation

-With OurParadise, we are initiating a series of conservation projects to preserve the marine and natural surroundings of Chumbe Island. +With Eden, we are initiating a series of conservation projects to preserve the marine and natural surroundings of Chumbe Island.

diff --git a/css/index.css b/css/index.css index e132fbe..438c62d 100644 --- a/css/index.css +++ b/css/index.css @@ -144,7 +144,7 @@ img[src*="#fig"] { } button:hover { - color: #984210; + color: #464646;; } button { @@ -173,28 +173,30 @@ font-weight: 500; white-space: normal; } -header .freeflow { +header .customize { background-color: transparent; position: absolute; } -footer .freeflow { - width: 100vw; +footer .customize { + /* width: 100vw; */ background-color: #FFFFFF; display: flex; flex-direction: column; align-items: center; - padding: 40px; + padding-top: 40px; + padding-bottom: 40px; + } -footer .freeflow img { +footer .customize img { width: 60px; } -header .freeflow div { +header .customize div { box-shadow: none; - text-transform: uppercase; + text-transform: capitalize; font-weight: 700 !important; } @@ -211,6 +213,10 @@ a { border: none; } +a:hover{ + color: #464646; +} + header { font-family: "Work Sans"; } diff --git a/static/images/footer.png b/static/images/footer.png index 0231e61..227bb8e 100644 Binary files a/static/images/footer.png and b/static/images/footer.png differ diff --git a/static/images/logo_placeholder_eden.png b/static/images/logo_placeholder_eden.png new file mode 100644 index 0000000..8c0e340 Binary files /dev/null and b/static/images/logo_placeholder_eden.png differ diff --git a/static/images/logo_placeholder_eden_2.png b/static/images/logo_placeholder_eden_2.png new file mode 100644 index 0000000..20e699e Binary files /dev/null and b/static/images/logo_placeholder_eden_2.png differ diff --git a/static/images/logo_placeholder_eden_3.png b/static/images/logo_placeholder_eden_3.png new file mode 100644 index 0000000..1e7638d Binary files /dev/null and b/static/images/logo_placeholder_eden_3.png differ diff --git a/static/images/logo_placeholder_eden_small.png b/static/images/logo_placeholder_eden_small.png new file mode 100644 index 0000000..f68b13b Binary files /dev/null and b/static/images/logo_placeholder_eden_small.png differ diff --git a/templates/partials/header.html b/templates/partials/header.html index f335da8..6972d5c 100644 --- a/templates/partials/header.html +++ b/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); } @@ -97,33 +97,33 @@ {% else %}

{% set header_class = config.extra.header_class | default(value='') %} -
+