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

This commit is contained in:
samaradel
2021-04-06 13:38:39 +02:00
44 changed files with 52 additions and 52 deletions

View File

@@ -1,11 +1,11 @@
<template>
<div class="flex flex-wrap with-large pt-8 pb-8 mx-4 sm:-mx-4">
<div class="text-center mx-auto my-4">
<h1 class="text-3xl text-gray-900 font-light sm:text-9xl sm:leading-10">
<h1 class="text-4xl text-gray-900 font-light sm:text-9xl sm:leading-10">
{{ main.title }} <span class="font-extrabold">{{ main.slogan }}</span>
</h1>
<div
class="mt-3 max-w-2xl mx-auto text-lg leading-7 text-gray-700 sm:mt-4"
class="mt-3 max-w-2xl mx-auto text-gray-600 sm:mt-4"
v-html="main.content"
></div>
</div>

View File

@@ -173,17 +173,17 @@
<a
v-else-if="element.external"
:href="element.link"
@click="clicked"
@click.native="clicked"
target="_blank"
class="inline-flex sm:flex uppercase p-2 mr-4 animated-link"
>{{ element.name }}</a
>
<a
<g-link
v-else
:href="element.link"
@click="clicked"
:to="element.link"
@click.native="clicked"
class="inline-flex sm:flex uppercase p-2 mr-4 animated-link"
>{{ element.name }}</a
>{{ element.name }}</g-link
>
</div>
<!-- <div

View File

@@ -14,31 +14,30 @@
</span>
<div
v-html="cta.content"
class="mb-8 mt-10 text-center text-lg text-gray-800"
class="mt-6 mb-8 text-gray-600"
></div>
<div class="mt-8 tracking-wide leading-loose" v-if="cta.video_button">
<a
@click="toggleModal"
class="inline-block bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
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"
>{{ cta.video_button }}</a
>
</div>
<g-link
class="inline-block bg-blue-900 lowercase text-md learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
class="inline-block bg-blue-900 text-md 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"
:to="cta.link"
>{{ cta.button }}</g-link
>
<g-link
class="inline-block bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
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"
v-if="cta.button2"
:to="cta.link2"
>{{ cta.button2 }}</g-link
>
<g-link
class="inline-block bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
v-if="cta.button3"
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" v-if="cta.button3"
:to="cta.link3"
>{{ cta.button3 }}</g-link
>
@@ -47,36 +46,36 @@
<div class="w-full max-w-7xl mx-auto" v-else>
<h2
v-if="cta.title"
class="text-4xl mb-2 leading-tight font-semibold font-heading"
class="text-4xl mb-2 uppercase leading-tight font-semibold font-heading"
>
{{ cta.title }}
</h2>
<div
v-html="cta.content"
class="mt-6 mb-8 text-lg text-gray-700 leading-relaxed"
class="mt-6 mb-8 text-gray-600"
></div>
<div class="mt-8 tracking-wide leading-loose" v-if="cta.video_button">
<a
@click="toggleModal"
class="inline-block bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
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"
>{{ cta.video_button }}</a
>
</div>
<a
class="inline-block lowercase bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
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
>
<g-link
class="inline-block lowercase bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
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"
v-if="cta.button2"
:to="cta.link2"
>{{ cta.button2 }}</g-link
>
<g-link
class="inline-block lowercase bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
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"
v-if="cta.button3"
:to="cta.link3"
>{{ cta.button3 }}</g-link

View File

@@ -37,13 +37,13 @@
v-if="main.link.includes('http')"
target="_blank"
:href="main.link"
class="bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full"
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 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full"
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>

View File

@@ -30,7 +30,7 @@
v-if="brand.btnTxt"
target="_blank"
:href="brand.sourceUrl"
class="bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-white px-12 py-2 mr-3 shadow rounded-full"
class="bg-blue-900 text-sm learn-button hover:bg-blue-800 text-white px-12 py-2 mr-3 shadow rounded-full"
>{{ brand.btnTxt }}</a
>
</div>

View File

@@ -25,13 +25,13 @@
<a
v-if="link.includes('http')"
target="_blank"
class="nline-block bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
class="nline-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"
:href="link"
>{{ button }}</a
>
<a
v-else
class="nline-block bg-blue-900 lowercase text-md learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
class="nline-block bg-blue-900 text-md learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
:href="link"
>{{ button }}</a
>
@@ -60,13 +60,13 @@
<a
v-if="link.includes('http')"
target="_blank"
class="bg-blue-900 text-md lowercase learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mb-4 shadow rounded-full"
class="bg-blue-900 text-md learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mb-4 shadow rounded-full"
:href="link"
>{{ button }}</a
>
<a
v-else
class="bg-blue-900 text-md lowercase learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mb-4 shadow rounded-full"
class="bg-blue-900 text-md learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mb-4 shadow rounded-full"
:href="link"
>{{ button }}</a
>
@@ -91,13 +91,13 @@
<a
v-if="link.includes('http')"
target="_blank"
class="inline-block lowercase 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"
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"
:href="link"
>{{ button }}</a
>
<a
v-else
class="inline-block lowercase bg-blue-900 text-md learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
class="inline-block bg-blue-900 text-md learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
:href="link"
>{{ button }}</a
>

View File

@@ -9,7 +9,7 @@
</h2>
<p
v-if="main !== null && main.subtitle"
class="mb-6 text-m tracking-widest text-gray-800"
class="mb-6 text-gray-600"
>
{{ main.subtitle }}
</p>
@@ -29,7 +29,7 @@
<div class="px-2 py-2">
<g-image class="py-4" :src="img(product.image)" />
<div class="font-bold text-xl mb-2">{{ product.title }}</div>
<div v-html="product.content" class="text-gray-700 text-base"></div>
<div v-html="product.content" class="text-gray-600"></div>
</div>
</a>
</div>
@@ -61,13 +61,13 @@
v-if="main.link.includes('http')"
target="_blank"
:href="main.link"
class="bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full"
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 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full"
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>

View File

@@ -23,7 +23,7 @@
<div class="px-2 py-2">
<g-image class="py-4" :src="img(product.image)" />
<!-- <div class="font-bold text-xl mb-2">{{ product.title }}</div> -->
<div v-html="product.content" class="text-gray-700 text-base"></div>
<div v-html="product.content" class="text-gray-600"></div>
</div>
</a>
</div>

View File

@@ -8,7 +8,7 @@
{{ main.title }} <span class="font-extrabold">{{ main.slogan }}</span>
</h1>
<div
class="mt-3 max-w-2xl mx-auto text-xl leading-7 text-gray-700 sm:mt-4"
class="mt-3 max-w-2xl mx-auto text-gray-600 sm:mt-4"
v-html="main.content"
></div>
</div>
@@ -29,7 +29,7 @@
<div class="text-lg leading-6 font-medium space-y-1">
<h4>{{ partnership.title }}</h4>
<div
class="text-base text-gray-700"
class="text-base text-gray-600"
v-html="partnership.content"
></div>
</div>