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

content/page/home/cta3/cta3.md

@@ -1,17 +1,14 @@
 ---
 id: home_cta3
-title: ''
+title: Our Partners
-title2: ''
+image: ./our_partners.jpg
-button: Explore the ThreeFold Universe
+button: Check All Partners
-link: /universe
+link: /partners
 button2: ''
 link2: ''
 button3: ''
 link3: ''
-
+button4: ''
+link4: ''
 ---
 
-<!-- button2: Spread our Message
-link: ''
-button3: Join our Community
-link: '' -->

content/page/home/home.md

@@ -27,8 +27,7 @@ cta4: home_cta4
 cta5: home_cta5
 comparisonMain: comparison
 comparisonSecs: [private, equal, sustainable]
-#logos: logo1
+
-logosMain : logo_home
 inTheNews: in_the_news
 solution_image: ./cta_image.png
 cta: home_cta
@@ -62,3 +61,6 @@ solution_image: ./home_header.png -->
 header: carbon_neutral -->
 
 <!-- solution_image2: ./qsfs.svg -->
+
+<!-- logos: logo1
+logosMain : logo_home -->

content/page/home/logos/logo10/logo.md

@@ -1,5 +0,0 @@
----
-id: log10
-image: ./dash.png
-url: /partners/skale_labs
----

content/page/home/logos/logo11/logo.md

@@ -1,5 +0,0 @@
----
-id: logo11
-image: ./saspelabs.png
-url: /partners/dash
----

content/page/home/logos/logo12/logo.md

@@ -1,5 +0,0 @@
----
-id: logo6
-image: ./matic.png
-url: /partners/presearch
----

content/page/home/logos/logo13/logo.md

@@ -1,5 +0,0 @@
----
-id: logo13
-image: ./matic.png
-url: /partners/presearch
----

content/page/home/logos/logo14/logo.md

@@ -1,5 +0,0 @@
----
-id: logo6
-image: ./matic.png
-url: /partners/presearch
----

content/page/home/logos/logo15/logo.md

@@ -1,5 +0,0 @@
----
-id: logo15
-image: ./matic.png
-url: /partners/presearch
----

content/page/home/logos/logo16/logo.md

@@ -1,5 +0,0 @@
----
-id: logo16
-image: ./matic.png
-url: /partners/presearch
----

content/page/home/logos/logo17/logo.md

@@ -1,5 +0,0 @@
----
-id: logo17
-image: ./matic.png
-url: /partners/presearch
----

content/page/home/logos/logo18/logo.md

@@ -1,5 +0,0 @@
----
-id: logo18
-image: ./matic.png
-url: /partners/presearch
----

content/page/home/logos/logo19/logo.md

@@ -1,5 +0,0 @@
----
-id: logo19
-image: ./matic.png
-url: /partners/presearch
----

content/page/home/logos/logo2/logo.md

@@ -1,5 +0,0 @@
----
-id: logo2
-image: ./hpe.png
-url: /partners/harmony
----

content/page/home/logos/logo20/logo.md

@@ -1,5 +0,0 @@
----
-id: logo20
-image: ./matic.png
-url: /partners/presearch
----

content/page/home/logos/logo3/logo.md

@@ -1,5 +0,0 @@
----
-id: logo3
-image: ./digitalbyte.png
-url: /partners/casperlabs
----

content/page/home/logos/logo4/logo.md

@@ -1,5 +0,0 @@
----
-id: logo4
-image: ./dash.png
-url: /partners/skale_labs
----

content/page/home/logos/logo5/logo.md

@@ -1,5 +0,0 @@
----
-id: logo5
-image: ./saspelabs.png
-url: /partners/dash
----

content/page/home/logos/logo6/logo.md

@@ -1,5 +0,0 @@
----
-id: logo6
-image: ./matic.png
-url: /partners/presearch
----

content/page/home/logos/logo7/logo.md

@@ -1,5 +0,0 @@
----
-id: logo7
-image: ./solidaridad.png
-url: /partners/hpe
----

content/page/home/logos/logo8/logo.md

@@ -1,5 +0,0 @@
----
-id: logo2
-image: ./hpe.png
-url: /partners/harmony
----

content/page/home/logos/logo9/logo.md

@@ -1,5 +0,0 @@
----
-id: logo3
-image: ./digitalbyte.png
-url: /partners/casperlabs
----

content/page/token/logos/main/main.md

@@ -3,5 +3,6 @@ id: partnersMain
 title: Believers in TFT
 button: Check All Partners
 link : /partners
+image: ./our_partners.jpg
 ---
 

src/components/custom/sections/CallToActionbg1.vue

@@ -1,77 +1,220 @@
 <template>
-  <section class="px-4 bg-cover text-center">
+  <section class="px-4 text-center">
-    <div class="w-full mx-auto tft_section2">
+  <div
-      <h2 class="text-9xl mb-2 leading-none font-heading mx-auto">
+      class="w-full max-w-7xl mx-auto mt-10 px-2 py-16"
-        {{ cta.title1 }}
+     
-        <br />
+    >
-        {{ cta.title2 }}
+     <h2
+        v-if="cta.title"
+        class="
+          lg:text-6xl
+          mb-2
+          uppercase
+          leading-tight
+          font-semibold font-heading
+        "
+      >
+        {{ cta.title }}
       </h2>
+      <g-image class="mx-auto w-3/4" :src="cta.image" />
+     
       <div
         v-html="cta.content"
-        class="text-gray-800 mb-4 text-2xl tft_subtitle"
+        class="mt-6 mb-8 mx-auto text-xl text-gray-800"
       ></div>
-
+      <div class="mt-8 tracking-wide leading-loose" v-if="cta.video_button">
-      <a
+        <a
-        class="
+          @click="toggleModal"
-          inline-block
+          class="
-          bg-gray-900
+            inline-block
-          text-2xl
+            cursor-pointer
-          learn-button
+            bg-blue-900
-          hover:bg-gray-800
+            text-lg
-          text-gray-100
+            learn-button
-          px-16
+            hover:bg-blue-800
-          py-1
+            text-gray-100
-          mb-4
+            px-12
-          shadow
+            py-2
-          rounded-full
+            mr-5
-          tft_subtitle
+            my-2
-          tracking-wide
+            shadow
-        "
+            rounded-full
-        target="_blank"
+          "
-        v-if="cta.button"
+          >{{ cta.video_button }}</a
-        :href="cta.link"
+        >
-        >{{ cta.button }}</a
+      </div>
-      >
+      <div v-if="cta.button" class="inline-block">
-      <g-link
+        <a
-        class="
+          class="
-          inline-block
+            inline-block
-          bg-gray-900
+            bg-white
-          text-2xl
+            text-lg
-          learn-button
+            learn-button
-          hover:bg-gray-800
+            hover:bg-gray-400
-          text-gray-100
+            bo
-          px-16
+            px-12
-          py-1
+            py-1
-          mb-4
+            mr-5
-          shadow
+            my-2
-          rounded-full
+            border-2
-          tft_subtitle
+            shadow
-          tracking-wide
+            border-black
-        "
+          "
-        v-if="cta.button2"
+          target="_blank"
-        :to="cta.link2"
+          v-if="cta.button && cta.link.includes('http')"
-        >{{ cta.button2 }}</g-link
+          :href="cta.link"
-      >
+          >{{ cta.button }}</a
-      <g-link
+        >
-        class="
+        <a
-          inline-block
+          class="
-          bg-gray-900
+            inline-block
-          text-2xl
+            bg-white
-          learn-button
+            text-lg
-          hover:bg-gray-800
+            learn-button
-          text-gray-100
+            hover:bg-gray-400
-          px-16
+            bo
-          py-1
+            px-12
-          mb-4
+            py-1
-          shadow
+            mr-5
-          rounded-full
+            my-2
-          tft_subtitle
+            border-2
-          tracking-wide
+            shadow
-        "
+            border-black
-        v-if="cta.button3"
+          "
-        :to="cta.link3"
+          v-else
-        >{{ cta.button3 }}</g-link
+          :href="cta.link"
-      >
+          >{{ cta.button }}</a
+        >
+      </div>
+      <div v-if="cta.button2" class="inline-block">
+        <a
+          class="
+            inline-block
+            bg-white
+            text-lg
+            learn-button
+            hover:bg-gray-400
+            bo
+            px-12
+            py-1
+            mr-5
+            my-2
+            border-2
+            shadow
+            border-black
+          "
+          target="_blank"
+          v-if="cta.button2 && cta.link2.includes('http')"
+          :href="cta.link2"
+          >{{ cta.button2 }}</a
+        >
+        <a
+          class="
+            inline-block
+            bg-white
+            text-lg
+            learn-button
+            hover:bg-gray-400
+            bo
+            px-12
+            py-1
+            mr-5
+            my-2
+            border-2
+            shadow
+            border-black
+          "
+          v-else
+          :href="cta.link2"
+          >{{ cta.button2 }}</a
+        >
+      </div>
+      <div v-if="cta.button3" class="inline-block">
+        <a
+          class="
+            inline-block
+            bg-white
+            text-lg
+            learn-button
+            hover:bg-gray-400
+            bo
+            px-12
+            py-1
+            mr-5
+            my-2
+            border-2
+            shadow
+            border-black
+          "
+          target="_blank"
+          v-if="cta.button3 && cta.link3.includes('http')"
+          :href="cta.link3"
+          >{{ cta.button3 }}</a
+        >
+        <a
+          class="
+            inline-block
+            bg-white
+            text-lg
+            learn-button
+            hover:bg-gray-400
+            bo
+            px-12
+            py-1
+            mr-5
+            my-2
+            border-2
+            shadow
+            border-black
+          "
+          v-else
+          :href="cta.link3"
+          >{{ cta.button3 }}</a
+        >
+      </div>
+      <div v-if="cta.button4" class="inline-block">
+        <a
+          class="
+            inline-block
+            bg-white
+            text-lg
+            learn-button
+            hover:bg-gray-400
+            bo
+            px-12
+            py-1
+            mr-5
+            my-2
+            border-2
+            shadow
+            border-black
+          "
+          target="_blank"
+          v-if="cta.button4 && cta.link4.includes('http')"
+          :href="cta.link4"
+          >{{ cta.button4 }}</a
+        >
+        <a
+          class="
+            inline-block
+            bg-white
+            text-lg
+            learn-button
+            hover:bg-gray-400
+            bo
+            px-12
+            py-1
+            mr-5
+            my-2
+            border-2
+            shadow
+            border-black
+          "
+          v-else
+          :href="cta.link4"
+          >{{ cta.button4 }}</a
+        >
+      </div>
     </div>
   </section>
 </template>

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

@@ -29,14 +29,12 @@
       </div>
     </div>
     <div v-else class="flex flex-wrap -mx-8">
-      <a
+    
+        <g-image class="mx-auto"
         v-for="(logo, idx) in logos"
-        :key="idx"
+        :key="idx" 
-        :href="logo.url"
+        :src="img(logo.image)" />
-        class="px-8 mb-8 mx-auto"
+      
-      >
-        <g-image :src="img(logo.image)" />
-      </a>
     </div>
     <a
       class="

src/pages/Index.vue

@@ -40,6 +40,13 @@
         :logos="$page.markdownPage.logos"
         :main="$page.markdownPage.logosMain"
       /> -->
+      <CallToActionbg1
+        v-if="$page.markdownPage.cta3"
+        :id="$page.markdownPage.id"
+        :cta="$page.markdownPage.cta3"
+      />
+    </div>
+      
     </div>
 
     <div class="container-fluid sm:pxi-0 mx-auto overflow-x-hidden">
@@ -185,14 +192,16 @@
         cta3{
           id
           title
-          title2
+          image
           content
           button
           button2
           button3
+          button4
           link
           link2
           link3
+          link4
         }
         cta4{
           id

src/templates/MarkdownPage.vue

@@ -394,6 +394,7 @@
         logosMain {
           id
           title
+          image
           button
           link
         }