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

content/navigation/navigation.md

@@ -1,10 +1,6 @@
 ---
 id: navigation
 navLinks:
-  - name: HOME
-    link: /
-    external: false
-    expandable: false
   - name: UNIVERSE
     link: "" # /dropdown
     external: false
@@ -43,6 +39,10 @@ navLinks:
     link: /why
     external: false
     expandable: false
+  - name: TOKEN
+    link: /token
+    external: false
+    expandable: false
   - name: PARTICIPATE
     link: "" # /dropdown
     external: false

content/page/home/header/header.md

@@ -1,14 +1,19 @@
 ---
-id: home_header
+id: carbon_neutral
 title: ''
-subtitle: Welcome to ThreeFold
+subtitle: Truly Better for Our Planet #Welcome to ThreeFold
 btn1: ''
 link1: ''
 btn2: ''
 link2: ''
 ---
 
-With our game-changing technology and incredible partners, together we are building a better Internet – for humanity and for our planet. 
+ThreeFold’s peer-to-peer nature brings considerable energy efficiencies as compared to current solutions. 
+<br/>
+<br/>
+The remaining carbon footprint of the grid will be converted into carbon credits and invested in planet positive projects to enable the world’s first carbon neutral grid.
+
+<!-- With our game-changing technology and incredible partners, together we are building a better Internet – for humanity and for our planet. 
 <br/>
 <br/>
 The ThreeFold peer-to-peer (P2P) Internet delivers on privacy and security, gives us all back ownership of our digital lives, can be made available everywhere in the world, and uses much less energy than today's solution. 
@@ -16,6 +21,6 @@ The ThreeFold peer-to-peer (P2P) Internet delivers on privacy and security, give
 <br/>
 It is the foundation for a more fair and equal tomorrow. 
 <br/>
-And it is available, today!
+And it is available, today! -->
 
 <!-- We are building the next generation peer-to-peer internet infrastructure. After creating a powerful and super sustainable operating system that can host all of humanity's digital needs and data in smart contracts, we are now creating a fair, equal and private Internet experience to free humanity from the tech giants that exploit our data.

content/page/home/home.md

@@ -18,7 +18,6 @@ brandPanel: fix_internet
 brandPanel2: grid_solution
 cta3: home_cta3
 cta4: home_cta4
-solution_image3: ./bg3.png
 cta5: home_cta5
 comparisonMain: comparison
 comparisonSecs: [private, equal, sustainable]
@@ -31,3 +30,6 @@ cta: home_cta
 <!-- header: home_header
 solution_image: ./home_header.png -->
 <!--  -->
+
+<!-- solution_image3: ./carbon_neutral.png
+header: carbon_neutral -->

content/page/home/productData/product1/nodes.md

@@ -6,4 +6,4 @@ button: Let's Do This!
 url: https://threefold.io/farming/3node
 ---
 
-Plug in a 3Node and earn income by selling decentralized storage space to people looking for a more secure hosting space.
+Plug in a 3Node and earn income by selling decentralized storage to people looking for a more secure hosting space.

content/page/token/brandPanel/brandPanel.md

@@ -2,7 +2,7 @@
 id: dive_TFT
 title: Dive Deeper into TFT
 subtitle:
-sourceUrl: https://threefold.io/farming/token
+sourceUrl: https://wiki.threefold.io/#/threefold__token_what
 btnTxt: Learn More
 image: dive-into.png
 ---

content/page/token/comparison/main/main.md

@@ -2,6 +2,10 @@
 id: token_comparison
 title: THE TFT FUELS THE P2P INTERNET
 description: It is the official medium of exchange for capacity on the ThreeFold Grid.
-button: Get Tokens
-link: https://threefold.io/info/threefold#/threefold__how_to_buy_and_sell #add button link here
+button: Expand ThreeFold 
+link: https://threefold.io/farming
 ---
+
+<!-- 
+button2: Use ThreeFold
+link2: https://info.threefold.io/#/threefold__use_tfgrid -->

content/page/token/token.md

@@ -7,7 +7,7 @@ header_slogan: WE ARE GROWING NOW
 header_title: YOU GROW WHEN THE THREEFOLD GRID GROWS
 header_image: ./token_header.png
 header_altImg: ThreeFold Token
-header_excerpt: The ThreeFold Token is the currency of the fastest growing P2P internet network on the planet. The perfect time to get involved in our growth is now.
+header_excerpt: The ThreeFold Token is the currency of the ThreeFold Grid - the new P2P Internet. The perfect time to get involved in our growth is now.
 button: Get Tokens
 link: https://threefold.io/info/threefold#/threefold__how_to_buy_and_sell
 comparisonMain: token_comparison

src/pages/Index.vue

@@ -13,11 +13,6 @@
       />
     </div>
     <div class="container sm:pxi-0 mx-auto overflow-x-hidden py-5">
-      <!-- <SolutionsHeader
-        v-if="$page.markdownPage.header"
-        :header="$page.markdownPage.header"
-      /> -->
-
       <g-image
         class="m-auto w-2/4 lg:mt-20"
         v-if="$page.markdownPage.solution_image2"
@@ -29,6 +24,17 @@
         :cta="$page.markdownPage.cta2"
       />
 
+      <!-- <g-image
+        class="m-auto w-2/4 lg:mt-20"
+        v-if="$page.markdownPage.solution_image3"
+        :src="$page.markdownPage.solution_image3.src"
+      /> -->
+
+      <!-- <SolutionsHeader
+        v-if="$page.markdownPage.header"
+        :header="$page.markdownPage.header"
+      /> -->
+
       <ShowcaseProducts
         :main="$page.markdownPage.productsMain"
         :products="$page.markdownPage.productData"
@@ -48,11 +54,6 @@
         :cta="$page.markdownPage.cta4"
       /> -->
 
-      <!-- <g-image
-        v-if="$page.markdownPage.solution_image3"
-        :src="$page.markdownPage.solution_image3.src"
-      /> -->
-
       <!-- <CallToAction
         v-if="$page.markdownPage.cta5"
         :cta="$page.markdownPage.cta5"
@@ -135,7 +136,7 @@
         link
         solution_image
         solution_image2
-        solution_image3
+     #  solution_image3
         header{
          title
          subtitle