Merge dev into production #13

Merged
samtaggart merged 16 commits from development into master 2023-09-06 09:14:54 +00:00
7 changed files with 31 additions and 4 deletions
Showing only changes of commit 08750d284f - Show all commits

View File

@ -13,7 +13,7 @@ weight: 1
<div class="text-white">
# About
## About FreeFlow Nation
<br>

View File

@ -13,7 +13,7 @@ weight: 1
<div class="text-white">
## Become a FreeFlow Citizen
## FreeFlow Solutions
<br>

BIN
content/farm/img/farm.jpeg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 MiB

20
content/farm/index.md Normal file
View File

@ -0,0 +1,20 @@
---
title: "Farm"
description: ""
date: 2018-09-14
updated: 2021-02-20
draft: false
weight: 1
---
<!-- section 1 -->
{% row(style="center" margin="tight" bgPath="img/farm.jpeg" bgStyle="full") %}
## Host the FreeFlow Internet
<br>
The FreeFlow Internet is our own Internet built by us, for all of us. By connecting a FreeFlow Node at your home or office, you can provide a new kind of Internet capacity to the people around you and be rewarded for doing this act of service. Support a sovereign future.
{% end %}

View File

@ -4,12 +4,13 @@ description: ""
insert_anchor_links: "left"
template: "partials/header.html"
extra:
logoPath: "/images/ff_logo3.png"
logoPath: "/images/ff_logo_new.png"
imgPath: ""
---
- [About]("/about")
- [Become a Citizen]("/citizenship")
- [FreeFlow Solutions]("/citizenship")
- [Host Our Internet]("/farm")
- Info
{% row(padding="none") %}

View File

@ -41,4 +41,10 @@ Come one, come all. Co-founders who are dreamers and doers. Digital Nomads and S
{% end %}
{% row(style="center" margin="narrow" padding="top") %}
## How it Works
{% end %}
</div>

Binary file not shown.

After

Width:  |  Height:  |  Size: 372 KiB