fix conflict

README.md

@@ -4,105 +4,43 @@ Production (master branch) [www.zanzibar.ourworld.tf](https://www.zanzibar.ourwo
 
 Staging (development branch) [www2.zanzibar.ourworld.tf](https://www2.zanzibar.ourworld.tf/)
 
-## 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. <br>
+__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)

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/_index.md

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

content/about/index.md

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

content/action/index.md

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

content/activities/index.md

@@ -7,7 +7,9 @@ draft: false
 weight: 4
 ---
 
-{% row(style="center narrow" margin="header" bgPath="img/activities_header.png" bgStyle="full") %} 
+{% row(style="center narrow" margin="tight" bgPath="img/activities_header_2.png" bgStyle="full") %} 
+
+<div class="bg-gray-200/50 py-4 px-4 rounded-md">
 
  ## Experience Authentic Paradise
  
@@ -15,12 +17,7 @@ weight: 4
 
 No worries. Take it easy. Slowly, slowly, or "Pole, pole," as they say on the island. We have plenty of activities and experiences for eco-conscious and nature-loving travelers.
 
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
+</div>
 
 {% end %}
 

content/header/index.md

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

content/home/index.md

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

content/location/index.md

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

content/protection/index.md

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

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";
 }

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">
                         <!-- 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">
                     <!-- 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 %}
@@ -223,4 +223,3 @@
     
 {% endif %}
 
-

templates/shortcodes/row.html

@@ -41,7 +41,7 @@ Parameters:
 {% if 2 < columns | length %}
     {% set row_class = row_class ~ " lg:items-start" %}
 {% else %} 
-    {% set row_class = row_class ~ " lg:items-center" %}
+    {% set row_class = row_class ~ " items-center" %}
 {% endif %}
 
 {% set col_class = "flex-1 mb-4 md:mb-12 lg:mb-0 lg:mx-2 xl:mx-4" %}
@@ -56,15 +56,19 @@ Parameters:
 
 <!-- Padding -->
 
-{% set padding_class = " py-8 md:py-8 lg:py-28" %}
+{% set padding_class = " py-8 md:py-8 lg:py-24" %}
 
 {% 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" %}
+        {% set padding_class = " py-2 md:py-4 lg:pt-24" %}
     {% elif "bottom" in padding %}
-        {% set padding_class = " py-2 md:py-4 lg:pb-28" %}
+        {% set padding_class = " py-2 md:py-4 lg:pb-24" %}
+    {% elif "both" in padding %}
+        {% set padding_class = " py-10 md:py-4 lg:py-24" %}
+    {% elif "headerboth" in padding %}
+        {% set padding_class = " py-24 md:py-4 lg:py-24" %}
     {% endif %}
 {% endif %}
 
@@ -87,11 +91,13 @@ Parameters:
     {% 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" %}
+        {% set margin_class = " mx-6 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" %}
+        {% set margin_class = " mx-6 sm:mx-32 md:mx-40 lg:mx-80" %}
     {% elif "header" in margin %}
-        {% set margin_class = " mx-12 sm:mx-20 md:mx-28 lg:mx-40 my-10" %}
+        {% set margin_class = " mx-6 sm:mx-20 md:mx-28 lg:mx-40 mt-10 lg:mt-0" %}
+    {% elif "withContainer" in margin %}
+        {% set margin_class = " mx-8 " %}
     {% endif %}
     {% if "lean-left" in margin %}
         {% set margin = margin_class | replace(from=" ", to=" first:")%}
@@ -117,7 +123,7 @@ Parameters:
 {% if style %}
 
     {% 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 %}
 
@@ -126,6 +132,13 @@ Parameters:
     {% set col_class = col_class ~ " flex-1 " %}
     {% endif %}
 
+    <!-- reverse col at mobile -->
+
+    {% if "reverse" in style %}
+    {% set row_class = "flex flex-col-reverse md:flex-row items-center mx-8" %}
+    {% endif %}
+
+
      <!-- makes row semi-full screen width, strips margins -->
     {% if "between" in style %}
         {% set row_class = row_class ~ " lg:max-w-6xl " %}
@@ -195,7 +208,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 flex overflow-hidden items-center ' ~ 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%}