Merge branch 'development' of github.com:threefoldfoundation/www_threefold_io into development

content/_index.md

@@ -7,4 +7,199 @@ draft: false
 extra:
   author: Your name here
   imgPath: images/threefold_globe.png
----
+<<<<<<< HEAD
+---
+
+
+<!-- section 1 (header) -->
+
+{% row(style="center") %}
+
+<br/>
+<br/>
+
+![Image](images/black_threefold_header.png#mx-auto#medium)
+
+<br/>
+
+## The (Re)Birth of **the Internet.**
+
+ThreeFold is a peer-to-peer open-source Internet platform that connects users directly with <br> local Internet capacity provided by farmers. No intermediaries such as centralized servers.
+
+{% end %}
+
+{% row(style="center narrow") %}
+
+<button>[Build](/build)</button>
+
+|||
+
+<button>[Farm](/farm)</button>
+
+|||
+
+<button>[Main Chat](https://t.me/threefold)</button>
+
+|||
+
+<button>[Get TFT](https://library.threefold.me/info/threefold#/tokens/threefold__how_to_buy)</button>
+
+{% end %}
+
+<!-- section 2 (Map) -->
+
+
+{% grid_stats() %}
+
+### The ThreeFold Grid v3.7.0
+
+## **Live and Operational**
+
+{% end %}
+
+
+<!-- section 3 (EXPAND) -->
+
+{% row(style="center narrow") %}
+
+## Together **We Build.**
+
+The future is about decentralization, participation, and working together to achieve our goals. As a decentralized movement, we encourage the community to get involved. This new Internet can only succeed if we find ways to collaborate where we together pull this Internet concept forward. Below, please find some of the ways you can join us in building a better Internet.
+
+{% end %}
+
+{% row(style="center narrow") %}
+
+![Image](images/become_farmer_new.jpg#mx-auto)
+
+<br>
+
+### Farm Local Internet Capacity **and Earn TFT**
+
+By connecting hardware at your home or office – or anywhere you'd like – you provide Internet capacity for the people around you and earn a new digital currency, TFT.
+
+{% end %}
+
+{% row(style="center narrow") %}
+
+<button>[Buy a 3Node](http://marketplace.3node.global/)</button>
+
+|||
+
+<button>[Build a 3Node](https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__diy_guide)</button>
+
+|||
+
+<button>[Farmers Chat](https://t.me/threefoldfarmers)</button>
+
+{% end %}
+
+{% row(style="center narrow") %}
+
+![Image](images/network_new.jpg#mx-auto)
+
+<br>
+
+### Build On Top of a **Decentralized Infrastructure**
+
+True digital sovereignty for open-source builders. The ThreeFold Grid provides limitless possibilities, and brings a playground of industry-compatible easy-to-deploy solutions for developers.
+
+{% end %}
+
+{% row(style="center narrow") %}
+
+<button>[Deploy on ThreeFold](https://dashboard.grid.tf/)</button>
+
+|||
+
+<button>[The Manual](https://library.threefold.me/info/manual/#/manual__manual3_home_new)</button>
+
+|||
+
+<button>[Builders Chat](https://t.me/threefoldtesting)</button>
+
+{% end %}
+
+<!-- section 4 (FEATURED STORIES) -->
+
+{% featured_stories() %}
+
+## Featured Stories
+
+{% end %}
+
+<!-- section 5 (THE TEAM) -->
+
+{% team_sec() %}
+
+## **The Team**
+
+{% end %}
+
+<!-- section 6 (PARTNERS) -->
+
+{% row(style="center margin") %}
+
+## Believers and Collaborators <br> **In a Better Internet**
+
+We are truly proud to be trusted by some of the biggest names in the industry.
+
+![Image](images/ourpartners.png#mx-auto)
+
+<button>[Check All Partners](partners)</button>
+
+{% end %}
+
+<br>
+
+<br>
+
+<!-- section 7 (IN THE NEWS) -->
+
+{% row(style="center") %}
+
+## **In the News**
+
+{% end %}
+
+{% row(style="center between") %}
+
+[![forbes](images/forbes.png#mx-auto)](https://www.forbes.com/sites/johnkoetsier/2020/06/20/largest-distributed-peer-to-peer-grid-on-the-planet-laying-foundation-for-a-decentralized-internet/?fbclid=IwAR1WKCpqLcWPRWg5bPD6RCQE5JJjRPt6ey5vbEnu3db2FvJnp6-YKeVZNW8#79aa340e6798)
+
+|||
+
+[![cointelegraph](images/cointelegraph.png#mx-auto)](https://cointelegraph.com/news/peer-to-peer-internet-has-lofty-goal-to-bring-true-decentralization)
+
+|||
+
+[![yahoo_news](images/yahoo_news.png#mx-auto)](https://news.yahoo.com/news/threefold-set-disrupt-status-quo-051457787.html?guccounter=1)
+
+{% end %}
+
+{% row(style="center between") %}
+
+[![hackernoon](images/hackernoon.png#mx-auto)](https://hackernoon.com/is-it-possible-to-create-a-decentralized-internet-this-startup-and-its-farmers-think-so-ey2e3ycf)
+
+|||
+
+[![smartereum](images/smartereum.png#mx-auto)](https://smartereum.com/189750/threefold-is-audaciously-building-a-new-decentralized-internet/)
+
+|||
+
+[![tga_daily](images/tga_daily.png#mx-auto)](https://tgdaily.com/web/6-dfinity-threefold-are-leading-an-internet-decentralization-revolution/)
+
+{% end %}
+
+{% row(style="center between") %}
+
+[![cointelegraph](images/cointelegraph.png#mx-auto)](https://cointelegraph-com.cdn.ampproject.org/c/s/cointelegraph.com/news/is-a-new-decentralized-internet-or-web-3-0-possible/amp)
+
+|||
+
+[![banklesstimes](images/banklesstimes.png#mx-auto)](https://www.banklesstimes.com/2021/06/14/threefolds-green-technology-strategy-to-a-fairer-more-sustainable-world/)
+
+|||
+
+[![grit_daily](images/grit_daily.png#mx-auto)](https://gritdaily.com/belarus-governments-control-internet/)
+
+{% end %}

content/farm/index.md

@@ -10,7 +10,7 @@ insert_anchor_links: "left"
 
 ## Be the **Internet**
 
-Become an Internet Farmer. Expand the ThreeFold Grid and earn for it.
+Become a ThreeFold Farmer. Provide Internet capacity to the people around you, and earn for it.
 
 <br>
 

content/header/index.md

@@ -21,7 +21,7 @@ extra:
 
 [Our People](/people)
 <br>
-Team, stories, & more
+<p class="text-sm">Team, stories, & more</p>
 
 </button>
 
@@ -31,7 +31,7 @@ Team, stories, & more
 
 [Our Partners](/partners)
 <br>
-Explore Our Partners
+<p class="text-sm">Explore Our Partners</p>
 
 |||
 
@@ -39,7 +39,7 @@ Explore Our Partners
 
 [ThreeFold Community](/community)
 <br>
-Welcome To The Fold
+<p class="text-sm">Welcome To The Fold</p>
 
 </button>
 
@@ -49,7 +49,7 @@ Welcome To The Fold
 
 [Developer Resources](/developer)
 <br>
-Join The Developer Community
+<p class="text-sm">Join The Developer Community</p>
 
 </button>
 
@@ -66,7 +66,7 @@ Join The Developer Community
 
 [ThreeFold Connect](https://library.threefold.me/info/threefold#/tokens/threefold__threefold_connect)
 <br>
-TFT Wallet, 2FA, & More
+<p class="text-sm">TFT Wallet, 2FA, & More</p>
 
 </button>
 
@@ -74,7 +74,7 @@ TFT Wallet, 2FA, & More
 
 [Dashboard](https://dashboard.grid.tf/)
 <br>
-Portal & Capacity Explorer
+<p class="text-sm">Portal & Capacity Explorer</p>
 
 </button>
 
@@ -82,7 +82,7 @@ Portal & Capacity Explorer
 
 [Weblet Playground](https://play.grid.tf)
 <br>
-Deploy a VM & More
+<p class="text-sm">Deploy a VM & More</p>
 
 |||
 
@@ -92,7 +92,7 @@ Deploy a VM & More
 
 [Library](https://library.threefold.me/info/threefold#/)
 <br>
-Explore the Documentation
+<p class="text-sm">Explore the Documentation</p>
 
 </button>
 
@@ -100,7 +100,7 @@ Explore the Documentation
 
 [Manual](https://library.threefold.me/info/manual/#/manual__manual3_home_new)
 <br>
-Get Started on the Grid
+<p class="text-sm">Get Started on the Grid</p>
 
 </button>
 
@@ -108,7 +108,7 @@ Get Started on the Grid
 
 [GitHub](https://github.com/)
 <br>
-Code Library & Documentation
+<p class="text-sm">Code Library & Documentation</p>
 
 |||
 
@@ -118,7 +118,7 @@ Code Library & Documentation
 
 [Blog](/blog)
 <br>
-Explore the Blogs
+<p class="text-sm">Explore the Blogs</p>
 
 </button>
 
@@ -126,7 +126,7 @@ Explore the Blogs
 
 [Newsroom](/newsroom)
 <br>
-Check the Latest Updates
+<p class="text-sm">Check the Latest Updates</p>
 
 </button>
 
@@ -134,7 +134,7 @@ Check the Latest Updates
 
 [Intro Docs](https://intro.threefold.me)
 <br>
-Perfect for Newcomers
+<p class="text-sm">Perfect for Newcomers</p>
 
 |||
 
@@ -144,13 +144,13 @@ Perfect for Newcomers
 
 [Forum](https://forum.threefold.io)
 <br>
-Questions & Feedback
+<p class="text-sm">Questions & Feedback</p>
 
 <button onclick="window.location.href='/support'">
 
 [Support](/support)
 <br>
-Speak Live with a Human
+<p class="text-sm">Speak Live with a Human</p>
 
 </button>
 
@@ -158,7 +158,7 @@ Speak Live with a Human
 
 [Careers](/careers)
 <br>
-Join the Team
+<p class="text-sm">Join the Team</p>
 
 </button>
 

templates/partials/header.html

@@ -128,7 +128,7 @@
 <nav>
     <div id="{{menu_id}}" class="mt-16 sm:mt-0 md:mt-0 lg:mt-0 xl:mt-0 2xl:mt-0 z-30 absolute inset-x-0 transform shadow-lg lg:backdrop-blur xl:backdrop-blur transition duration-200 ease-in opacity-0 -translate-y-1 hidden">
         <div class="bg-white lg:bg-semi-white md:bg-semi-white xl:bg-semi-white">
-            <div id="menu" class="mx-8 lg:mx-40 xl:mx-40 px-6 sm:p-6 md:p-8">
+            <div id="menu" class="mx-8 lg:mx-10 xl:mx-10 px-6 sm:p-6 md:p-8">
                 {{header_menu | safe }}
             </div>
         </div>            

templates/shortcodes/row.html

@@ -51,7 +51,7 @@ Parameters:
     {% set row_class = row_class ~ " lg:items-center" %}
 {% endif %}
 
-{% set col_class = "flex-1 mb-6 md:mb-0 md:mx-8" %}
+{% set col_class = "flex-1 mb-6 md:mb-0 md:mx-2" %}
 {% set row_id = '' %}
 
 {% if id %}