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

content/navigation/navigation.md

@@ -6,7 +6,7 @@ navLinks:
     external: false
     expandable: false
 
-  - name: Grid
+  - name: ThreeFold Grid
     link: /grid
     external: false
     expandable: false
@@ -15,103 +15,7 @@ navLinks:
     link: /token
     external: false
     expandable: false
-
-  - name: oldToken
-    link: ""
-    external: false
-    expandable: true
-    submenu:
-      - title: Token Introduction
-        path: /oldtoken
-      - title: Buy TFT
-        path: https://threefold.io/info/threefold#/threefold__how_to_buy_and_sell
-        external: true
-      - title: Tokenomics
-        path: https://threefold.io/info/threefold#/threefold__tokenomics
-        external: true
-      - title: Distribution
-        path: https://threefold.io/info/threefold#/threefold__token_overview
-        external: true
-      - title: FAQ / Forum
-        path: https://forum.threefold.io/c/threefold-token/tft-faq/57
-        external: true
   
-  - name: Farming
-    link: "" # /dropdown
-    external: false
-    expandable: true
-    submenu:
-      - title: Grid Introduction
-        path: https://threefold.io/farming/
-        external: true
-      - title: Start Farming
-        path: https://threefold.io/farming/farming
-        external: true
-      - title: Get a 3Node
-        path: https://threefold.io/farming/get_3node
-        external: true
-      - title: FAQ / Forum
-        path: https://forum.threefold.io/c/farming/farming-faq/53
-        external: true
-      - title: Explorer
-        path: https://explorer.threefold.io/
-        external: true            
-  
-  - name: Use
-    link: "https://cloud.threefold.io/"
-    external: true
-    expandable: true
-    submenu:
-      - title: Partners
-        path: /partners    
-      - title: Cloud
-        path: https://cloud.threefold.io
-        external: true      
-      - title: Marketplace
-        path: https://threefold.io/marketplace
-        external: true
-      - title: Digital Twin
-        path: https://mydigitaltwin.io/
-        external: true
-      - title: Developers (SDK)
-        path: https://sdk.threefold.io/
-        external: true
-      # - title: Kubernetes Cloud
-      #   path: https://threefold.io/info/cloud#/cloud__evdc
-      #   external: true
-      # - title: Quantum-Safe Storage
-      #   path: https://threefold.io/info/cloud#/cloud__threefold_filesystem
-      #   external: true
-
-  # - name: Partners
-  #   link: "/partners" # /dropdown
-  #   external: false
-  #   expandable: false
-
-  - name: Technology
-    link: "" # /dropdown
-    external: false
-    expandable: true
-    submenu:
-      - title: Grid Technology
-        path: https://threefold.io/info/threefold#/internet4__technology
-        external: true
-      - title: Zero-OS
-        path: https://threefold.io/info/threefold#/internet4__tfgrid_primitives
-        external: true
-      - title: Smart Contract for IT
-        path: https://threefold.io/info/threefold#/internet4__smartcontract_it
-        external: true
-      - title: P2P Network
-        path: https://threefold.io/info/threefold#/internet4__planetary_network
-        external: true
-      - title: Web2 vs Web3 vs P2P
-        path: https://threefold.io/info/threefold#/threefold__grid_compare
-        external: true
-      - title: FAQ / Forum
-        path: https://forum.threefold.io/c/technical-discussion/technical-faq/55
-        external: true
-
   - name: Community
     link: "" # /dropdown
     external: false
@@ -220,4 +124,100 @@ social:
 
       - title: ThreeFold Tech
         path: https://threefold.tech
-        external: true -->
+        external: true -->
+<!-- 
+        - name: Token
+    link: ""
+    external: false
+    expandable: true
+    submenu:
+      - title: Token Introduction
+        path: /token
+      - title: Buy TFT
+        path: https://threefold.io/info/threefold#/threefold__how_to_buy_and_sell
+        external: true
+      - title: Tokenomics
+        path: https://threefold.io/info/threefold#/threefold__tokenomics
+        external: true
+      - title: Distribution
+        path: https://threefold.io/info/threefold#/threefold__token_overview
+        external: true
+      - title: FAQ / Forum
+        path: https://forum.threefold.io/c/threefold-token/tft-faq/57
+        external: true
+  
+  - name: Farming
+    link: "" # /dropdown
+    external: false
+    expandable: true
+    submenu:
+      - title: Grid Introduction
+        path: https://threefold.io/farming/
+        external: true
+      - title: Start Farming
+        path: https://threefold.io/farming/farming
+        external: true
+      - title: Get a 3Node
+        path: https://threefold.io/farming/get_3node
+        external: true
+      - title: FAQ / Forum
+        path: https://forum.threefold.io/c/farming/farming-faq/53
+        external: true
+      - title: Explorer
+        path: https://explorer.threefold.io/
+        external: true            
+  
+  - name: Use
+    link: "https://cloud.threefold.io/"
+    external: true
+    expandable: true
+    submenu:
+      - title: Partners
+        path: /partners    
+      - title: Cloud
+        path: https://cloud.threefold.io
+        external: true      
+      - title: Marketplace
+        path: https://threefold.io/marketplace
+        external: true
+      - title: Digital Twin
+        path: https://mydigitaltwin.io/
+        external: true
+      - title: Developers (SDK)
+        path: https://sdk.threefold.io/
+        external: true
+       - title: Kubernetes Cloud
+         path: https://threefold.io/info/cloud#/cloud__evdc
+         external: true
+       - title: Quantum-Safe Storage
+         path: https://threefold.io/info/cloud#/cloud__threefold_filesystem
+         external: true
+
+   - name: Partners
+     link: "/partners" # /dropdown
+     external: false
+     expandable: false
+
+  - name: Technology
+    link: "" # /dropdown
+    external: false
+    expandable: true
+    submenu:
+      - title: Grid Technology
+        path: https://threefold.io/info/threefold#/internet4__technology
+        external: true
+      - title: Zero-OS
+        path: https://threefold.io/info/threefold#/internet4__tfgrid_primitives
+        external: true
+      - title: Smart Contract for IT
+        path: https://threefold.io/info/threefold#/internet4__smartcontract_it
+        external: true
+      - title: P2P Network
+        path: https://threefold.io/info/threefold#/internet4__planetary_network
+        external: true
+      - title: Web2 vs Web3 vs P2P
+        path: https://threefold.io/info/threefold#/threefold__grid_compare
+        external: true
+      - title: FAQ / Forum
+        path: https://forum.threefold.io/c/technical-discussion/technical-faq/55
+        external: true -->

content/page/home/home.md

@@ -11,9 +11,9 @@ header_altImg: threefold
 header_excerpt: The digital infrastructure for an interconnected world.
 button: Expand the network
 link: /
-button2: Expand the network2
+button2: Peer-to-Peer Cloud
 link2: /
-button3: Expand the network3
+button3: How it Works
 link3: /
 
 cta2: home_cta2