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

content/footer/footer.md

@@ -13,41 +13,41 @@ items:
  - title: PARTICIPATE
    links:
     - name: Get TFT
-      link: /info/threefold#/threefold__how_to_buy_and_sell
+      link: https://threefold.io/info/threefold#/threefold__how_to_buy_and_sell
     - name: Store TFT
-      link: /info/threefold#/threefold__storing_tft
+      link: https://threefold.io/info/threefold#/threefold__storing_tft
     - name: Be The Internet
-      link: /farming
+      link: https://threefold.io/farming
     - name: P2P Cloud
-      link: /cloud
+      link: https://threefold.io/cloud
     - name: P2P Marketplace
-      link: /marketplace
+      link: https://threefold.io/marketplace
     - name: Digital Twin
-      link: /twin
+      link: https://threefold.io/twin
  
  - title: LEARN
    links:
     - name: What is ThreeFold?
-      link: /info/threefold
+      link: https://threefold.io/info/threefold
     - name: What is TFT?
-      link: /farming/token
+      link: https://threefold.io/farming/token
     - name: Knowledge Base
-      link: /info/threefold#/
+      link: https://threefold.io/info/threefold#/
     - name: Manuals
-      link: /info/threefold#/tftech__tf_manuals?id=threefold-manuals
+      link: https://threefold.io/info/threefold#/tftech__tf_manuals?id=threefold-manuals
     - name: ThreeFold Foundation
-      link: /info/threefold#/threefold__threefold_foundation
+      link: https://threefold.io/info/threefold#/threefold__threefold_foundation
     - name: ThreeFold Glossary
-      link: /info/threefold#/threefold__defs
+      link: https://threefold.io/info/threefold#/threefold__defs
 
  - title: DEVELOPERS
    links:
     - name: Get Started
-      link: /info/threefold#/tftech__tf_manuals?id=threefold-manuals
+      link: https://threefold.io/info/threefold#/tftech__tf_manuals?id=threefold-manuals
     - name: SDK
-      link: /info/sdk
+      link: https://threefold.io/info/sdk
     - name: P2P Cloud
-      link: /info/threefold#/tftech__manual_cloud
+      link: https://threefold.io/info/threefold#/tftech__manual_cloud
     - name: GitHub
       link: https://github.com/threefoldfoundation
  
@@ -60,14 +60,14 @@ items:
     - name: Partners
       link: /partners
     - name: Conscious Internet
-      link: /aci
+      link: https://threefold.io/aci
     - name: ThreeFold Tech
-      link: /tftech
+      link: https://threefold.io/tftech
 
  - title: ABOUT
    links:
     - name: ThreeFold
-      link: /info/threefold
+      link: https://threefold.io/info/threefold
     - name: Forum
       link: https://forum.threefold.io/
     - name: Contact Us
@@ -75,7 +75,7 @@ items:
 ---
 
 
-<!-- [Terms & Conditions](https://new.threefold.io/info/legal#/legal__terms_conditions_websites) | [Privacy Policy](https://new.threefold.io/info/legal#/legal__privacypolicy) | [Impressum]()
+<!-- [Terms & Conditions](https://threefold.io/info/legal#/legal__terms_conditions_websites) | [Privacy Policy](https://threefold.io/info/legal#/legal__privacypolicy) | [Impressum]()
 
 <br/>
 &#xA9; 2021 ThreeFold, All rights reserved. -->

content/navigation/navigation.md

@@ -8,18 +8,23 @@ navLinks:
     submenu:
       - title: Be The Internet
         path: /farming
+        external: true
 
       - title: P2P Cloud
         path: /cloud
+        external: true
 
       - title: P2P Marketplace
         path: /marketplace
+        external: true
 
       - title: Digital Twin
         path: /twin
+        external: true
 
       - title: ThreeFold Token
         path: /farming/token
+        external: true
 
   - name: LEARN
     link: '' # /dropdown
@@ -28,6 +33,7 @@ navLinks:
     submenu:
       - title: Knowledge Base
         path: /info/threefold
+        external: true
 
       - title: Blog
         path: /blog
@@ -49,6 +55,7 @@ navLinks:
 
       - title: Conscious Internet
         path: /aci
+        external: true
 
       - title: ThreeFold Tech
         path: https://threefold.tech/

content/page/home/comparison/main/main.md

@@ -3,5 +3,5 @@ id: comparison
 title: GIVE THE WORLD A BETTER INTERNET
 description: The current Internet is centralized to tech giants that build power-hungry data centers and exploit user data. ThreeFold looks at updating the current $3.9 Billion IT with a new paradigm that serves people and our planet.
 button: Our Values
-link: /aci/about #add button link here
+link: https://threefold.io/aci/about #add button link here
 ---

content/page/home/cta/cta.md

@@ -2,7 +2,7 @@
 id: home_cta
 title: JOIN THE MOVEMENT
 button: Support Us By Purchasing Tokens
-link: /info/threefold#/how_to_buy_and_sell
+link: https://threefold.io/info/threefold#/how_to_buy_and_sell
 button2: Stay Updated
 link2: https://t.me/threefoldnews
 button3: Join Our Community

content/page/home/home.md

@@ -8,7 +8,7 @@ header_excerpt: Welcome to the world’s largest peer-to-peer internet, formed b
 button: ''
 link: ''
 productsMain: product
-productData: [tokens, nodes, storage]
+productData: [farming, cloud, marketplace, twin, tech, aci]
 logos: [logo1, logo2, logo3, logo4, logo5, logo6]
 brandPanel: fix_internet
 comparisonMain: comparison

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

@@ -0,0 +1,7 @@
+---
+id: farming
+title: ''
+image : ./farming.png
+url : /farming
+---
+

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

@@ -1,7 +0,0 @@
----
-id: tokens
-title: ''
-image : ./tokens.png
-url : /farming/token
----
-

content/page/home/productData/product2/cloud.md

@@ -0,0 +1,7 @@
+---
+id: cloud
+title: ''
+image : ./cloud.png
+url : /cloud
+---
+

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

@@ -1,7 +0,0 @@
----
-id: nodes
-title: ''
-image : ./nodes.png
-url : /farming/3node
----
-

content/page/home/productData/product3/marketplace.md

@@ -0,0 +1,7 @@
+---
+id: marketplace
+title: ''
+image : ./marketplace.png
+url : /marketplace
+---
+

content/page/home/productData/product3/storage.md

@@ -1,7 +0,0 @@
----
-id: storage
-title: ''
-image : ./storage.png
-url : /cloud
----
-

content/page/home/productData/product4/product4.md

@@ -1,7 +0,0 @@
----
-id: product4
-title: ''
-image : ./twin_card.png
-url : /twin
----
-

content/page/home/productData/product4/twin.md

@@ -0,0 +1,7 @@
+---
+id: twin
+title: ''
+image : ./twin.png
+url : /twin
+---
+

content/page/home/productData/product5/tech.md

@@ -1,7 +1,7 @@
 ---
-id: product5
+id: tech
 title: ''
-image : ./grid_card.png
+image : ./tech.png
 url : https://threefold.tech
 ---
 

content/page/home/productData/product6/aci.md

@@ -0,0 +1,7 @@
+---
+id: aci
+title: ''
+image : ./aci.png
+url : /aci
+---
+

content/page/home/productData/product6/product6.md

@@ -1,7 +0,0 @@
----
-id: product6
-title: ''
-image : ./aci_card.png
-url : /aci
----
-

src/components/custom/sections/CallToAction.vue

@@ -15,6 +15,7 @@
 
        <a
           class="inline-block bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full" 
+          target="_blank"
           v-if="cta.button"
           :href="cta.link"
           >{{ cta.button }}</a

src/components/custom/sections/Comparison.vue

@@ -26,11 +26,25 @@
       </div>
     </div>
     <div>
-      <a
+      <!-- <a
         v-if="main.button"
         class="bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full"
         :href="main.link"
         >{{ main.button }}</a
+      > -->
+
+       <a
+              v-if="main.link.includes('http')"
+              target="_blank"
+              :href="main.link"
+              class="bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full"
+              >{{ main.button }}</a
+            >
+            <g-link
+              v-else
+              :href="main.link"
+              class="bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full"
+              >{{ main.button }}</g-link
             >
     </div>
   </section>

src/components/marketing/sections/cta-sections/BrandPanel.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <div class="max-w-screen-xl mx-auto py-16">
+    <div class="max-w-screen-xl mx-auto py-24">
       <div
         class="brandpanel bg-gray-900 rounded-lg shadow-xl overflow-hidden lg:grid lg:grid-cols-2 lg:gap-4"
       >

src/components/marketing/sections/cta-sections/Footer.vue

@@ -187,13 +187,13 @@
           <a
             class="leading-6 text-gray-500 hover:text-gray-900"
             target="_blank"
-            href="https://new.threefold.io/info/legal#/legal__terms_conditions_websites"
+            href="https://threefold.io/info/legal#/legal__terms_conditions_websites"
             >Terms & Conditions |
           </a>
           <a
             class="leading-6 text-gray-500 hover:text-gray-900"
             target="_blank"
-            href="https://new.threefold.io/info/legal#/legal__privacypolicy"
+            href="https://threefold.io/info/legal#/legal__privacypolicy"
             >Privacy Policy |
           </a>
           <a

src/components/marketing/sections/cta-sections/Header.vue

@@ -2,8 +2,8 @@
   <section class="py-12 px-4">
     <div class="flex flex-wrap items-center text-center lg:text-left -mx-2">
       <div class="lg:w-1/2 px-2 lg:pr-10 mt-10 lg:mt-0 order-1 lg:order-none">
-        <h2 class="text-6xl mb-6 leading-tight font-bold font-heading">
-          <span class="text-teal-200">{{ slogan }}</span
+        <h2 class="text-6xl mb-6 leading-none font-extrabold font-heading">
+          <span class="text-blue-600">{{ slogan }}</span
           > {{ title }}
         </h2>
         <div class="mb-8 text-gray-700 leading-relaxed" v-html="excerpt"></div>

src/components/marketing/sections/cta-sections/ShowcaseProducts.vue

@@ -7,10 +7,11 @@
       <p v-if="main !== null" class="mb-6 text-m tracking-widest text-gray-800">{{ main.subtitle }}</p>
     </div> 
 
-    <div class="grid grid-cols-1 gap-4 sm:grid-cols-3">
+    <div class="grid grid-cols-1 gap-4 sm:grid-cols-2">
 
         <a
         v-for="(product, idx) in products"
+        target="_blank"
         :key="idx"
         :href="product.url"
           class="m-auto rounded overflow-hidden transition duration-500"

src/components/marketing/sections/logo-clouds/off_white_grid.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="bg-white">
-    <div class="max-w-screen-xl mx-auto py-12 px-4 sm:px-6 lg:py-16 lg:px-8">
+    <div class="max-w-screen-xl mx-auto py-12 px-4 sm:px-6 lg:py-24 lg:px-2">
       <div
         v-html="news.content"
         class="text-center text-4xl font-semibold leading-tight font-heading"