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

2021-09-19 16:55:04 +02:00
parent e8a4a9940a 215583c521
commit 6af64c8d23
10 changed files with 132 additions and 131 deletions
--- a/content/navigation/navigation.md
+++ b/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 -->
--- a/content/page/home/cta/number_bg2.png
+++ b/content/page/home/cta/number_bg2.png
--- a/content/page/home/home.md
+++ b/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
--- a/src/components/custom/Roadmap.vue
+++ b/src/components/custom/Roadmap.vue
@@ -1,10 +1,10 @@
 <template>
  <section class="pb-10 px-4 bg-cover text-center">
    <div class="w-full mx-auto">
-      <g-image :src="roadmap.image" />
+      <g-image class="lg:w-3/4 mx-auto" :src="roadmap.image" />
      <div
        v-html="roadmap.content"
-        class="mt-10 mb-8 lg:text-2xl text-gray-900"
+        class="mt-10 mb-8 lg:text-xl text-gray-900"
      ></div>
    </div>
  </section>
--- a/src/components/custom/sections/CallToAction.vue
+++ b/src/components/custom/sections/CallToAction.vue
@@ -1,6 +1,6 @@
 <template>
  <section
-    class="pb-10 px-4 bg-cover text-center"
+    class="px-4 bg-cover text-center"
    :class="{
      pink: id == 'home' && !lastCta,
      green: id == 'about-us' && lastCta,
@@ -8,7 +8,7 @@
  >
    <!-- about-us -->
    <div
-      class="w-full max-w-2xl mx-auto py-12"
+      class="w-full max-w-2xl mx-auto lg:py-20"
      v-if="id == 'about-us' && !textOnly && !lastCta"
    >
      <h2
@@ -26,7 +26,7 @@
      </h2>
      <div
        v-html="cta.content"
-        class="mt-6 mb-8 lg:text-2xl text-gray-800"
+        class="mt-6 mb-8 lg:text-xl text-gray-800"
      ></div>
      <g-image :src="cta.image" class="my-10" />

@@ -54,7 +54,7 @@
        class="
          inline-block
          bg-white
-          text-sm
+          text-xl
          learn-button
          hover:bg-gray-400
          px-12
@@ -75,7 +75,7 @@
        class="
          inline-block
          bg-white
-          text-sm
+          text-xl
          learn-button
          hover:bg-gray-400
          px-12
@@ -111,7 +111,7 @@
      </h2>
      <div
        v-html="cta.content"
-        class="mt-6 mb-8 lg:text-2xl text-gray-800"
+        class="mt-6 mb-8 lg:text-xl text-gray-800"
      ></div>
    </div>

@@ -147,13 +147,13 @@
      </h2>
      <div
        v-html="cta.content"
-        class="mt-6 mb-8 lg:text-2xl text-gray-800"
+        class="mt-6 mb-8 lg:text-xl text-gray-800"
      ></div>
      <a
        class="
          inline-block
          bg-white
-          text-sm
+          text-lg
          learn-button
          hover:bg-gray-400
          px-12
@@ -174,7 +174,7 @@
        class="
          inline-block
          bg-white
-          text-sm
+          text-lg
          learn-button
          hover:bg-gray-400
          px-12
@@ -199,14 +199,14 @@
    >
      <h2
        v-if="cta.title"
-        class="text-3xl uppercase leading-tight font-semibold font-heading"
+        class="text-5xl uppercase mb-0 leading-tight font-semibold font-heading"
      >
        {{ cta.title }}
      </h2>

      <h2
        v-if="cta.subtitle"
-        class="text-3xl uppercase leading-tight font-semibold font-heading"
+        class="text-5xl uppercase mt-0 leading-tight font-semibold font-heading"
      >
        {{ cta.subtitle }}
      </h2>
@@ -480,7 +480,7 @@
      <g-image :src="cta.image" />
      <h2
        v-if="cta.title"
-        class="text-3xl mb-2 uppercase leading-tight font-semibold font-heading"
+        class="text-5xl mb-2 uppercase leading-tight font-semibold font-heading"
      >
        {{ cta.title }}
      </h2>
--- a/src/components/marketing/sections/blog-sections/3_column_cards.vue
+++ b/src/components/marketing/sections/blog-sections/3_column_cards.vue
@@ -7,12 +7,11 @@
      <div class="text-center">
        <h2
          class="
-            text-4xl
+            text-5xl
            leading-tight
            mb-6
            font-bold font-heading
            uppercase
-            sm:text-4xl
            sm:leading-10
          "
        >
--- a/src/components/marketing/sections/cta-sections/BrandPanel.vue
+++ b/src/components/marketing/sections/cta-sections/BrandPanel.vue
@@ -254,7 +254,7 @@
      <!-- About us -->
      <div
        v-else-if="id == 'about-us' && !brandPanel2 && !brandPanel3"
-        class="flex flex-wrap text-left"
+        class="flex flex-wrap text-left lg:my-10"
      >
        <div class="lg:w-1/2 px-2 self-center">
          <g-image class="mx-auto" :src="image" :alt="brand.title" />
@@ -271,7 +271,7 @@
              class="
                py-6
                mt-4
-                text-gray-900 text-2xl
+                text-xl
                leading-tight
                tracking-wide
              "
@@ -301,7 +301,7 @@

      <div
        v-else-if="id == 'about-us' && brandPanel2"
-        class="flex flex-wrap lg:text-left lg:pt-16 px-4"
+        class="flex flex-wrap lg:text-left lg:pt-16 px-4 lg:mb-20"
      >
        <div class="lg:w-1/2 px-2 lg:mt-10 order-1 lg:order-none">
          <div class="lg:self-center">
@@ -345,7 +345,7 @@

      <div
        v-else-if="id == 'about-us' && brandPanel3"
-        class="flex flex-wrap lg:text-left lg:pt-16 px-4"
+        class="flex flex-wrap lg:text-left lg:py-12 px-4"
      >
        <div class="lg:w-1/2 px-2 self-center">
          <g-image :src="image" :alt="brand.title" />
@@ -359,7 +359,7 @@
              }}</span>
            </h2>
            <div
-              class="pb-6 text-gray-900 text-2xl leading-tight tracking-wide"
+              class="pb-6 text-gray-900 text-xl leading-tight tracking-wide"
              v-html="brand.content"
            ></div>
            <a
--- a/src/components/marketing/sections/cta-sections/Header.vue
+++ b/src/components/marketing/sections/cta-sections/Header.vue
@@ -42,7 +42,7 @@
        </span>

        <div
-          class="mb-8 text-center text-md mx-10 text-gray-600"
+          class="mb-8 text-center text-xl mx-10 text-gray-600"
          v-html="excerpt"
        ></div>
        <div v-if="button">
@@ -93,7 +93,7 @@
    </div>

    <div
-      class="flex flex-wrap text-center items-center lg:text-left lg:mt-4 -mx-2"
+      class="flex flex-wrap text-center items-center lg:text-left lg:mb-10 lg:mt-4 -mx-2"
      v-else-if="id == 'about-us'"
    >
      <div class="lg:w-1/2 px-2 lg:pr-10 lg:mt-10 order-1 lg:order-none">
@@ -116,9 +116,11 @@
            mb-8
            px-10
            text-center
-            lg:text-5xl
+            text-xl
            text-extrabold
            leading-tight
+            lg:max-w-2xl
+            mx-auto
          "
          v-html="excerpt"
        ></div>
@@ -129,7 +131,7 @@
            class="
              inline-block
              bg-white
-              text-sm
+              text-lg
              learn-button
              hover:bg-gray-400
              bo
@@ -149,7 +151,7 @@
            class="
              inline-block
              bg-white
-              text-sm
+              text-lg
              learn-button
              hover:bg-gray-400
              bo
@@ -262,7 +264,7 @@
          ><br />
          {{ title }}
        </h2>
-        <div class="mb-8 text-lg leading-relaxed" v-html="excerpt"></div>
+        <div class="mb-8 text-xl leading-relaxed" v-html="excerpt"></div>

        <a
          v-if="link.includes('http')"
--- a/src/components/marketing/sections/cta-sections/ShowcaseProducts.vue
+++ b/src/components/marketing/sections/cta-sections/ShowcaseProducts.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="py-0 mb-5 mx-4">
    <div class="text-center mx-auto my-4" v-if="id == 'why'">
-      <h1 class="text-4xl text-gray-900 font-light sm:text-9xl sm:leading-10">
+      <h1 class="text-5xl text-gray-900 font-light sm:text-9xl sm:leading-10">
        {{ main.title }} <span class="font-extrabold">{{ main.subtitle }}</span>
      </h1>
      <div
@@ -12,7 +12,7 @@
    <div class="w-full text-center" v-else>
      <h2
        v-if="main !== null && main.title"
-        class="text-4xl font-semibold leading-tight font-heading"
+        class="text-5xl font-semibold leading-tight font-heading"
      >
        {{ main.title }}
      </h2>
--- a/src/components/marketing/sections/cta-sections/ShowcaseProductsHome.vue
+++ b/src/components/marketing/sections/cta-sections/ShowcaseProductsHome.vue
@@ -3,11 +3,11 @@
    <div class="w-full max-w-7xl mx-auto mt-10 px-16 text-center">
      <h2
        v-if="main !== null"
-        class="text-4xl font-semibold leading-tight font-heading"
+        class="text-5xl font-semibold leading-tight font-heading"
      >
        {{ main.title }}
      </h2>
-      <p v-if="main !== null" class="mb-6 text-gray-700">
+      <p v-if="main !== null" class="mb-6 text-xl">
        {{ main.subtitle }}
      </p>
    </div>