ourworld_web/www_threefold_io
23
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Ehab Hassan
2021-04-06 12:19:19 +02:00
parent 440cf3f213
commit 0b4852de48
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/custom/Navbar/Navbar.vue
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

11
src/components/custom/sections/CallToAction.vue
View File

@@ -37,8 +37,7 @@
>{{ cta.button2 }}</g-link
>
<g-link
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"
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
>
@@ -58,25 +57,25 @@
<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

2
src/components/marketing/sections/cta-sections/BrandPanel.vue
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>

12
src/components/marketing/sections/cta-sections/Header.vue
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
>