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

Fix conflicts

Browse Source
This commit is contained in:
samaradel
2021-05-24 10:04:46 +02:00
parent 07f0036c1d 4ee8dbb186
commit 8f61ca2cc3
7 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/custom/VideoPanel.vue
View File

@@ -1,5 +1,5 @@
<template>
<div class="video_bg lg:py-20 lg:flex lg:justify-center flex flex-col">
<div class="lg:py-20 lg:flex lg:justify-center flex flex-col">
<div class="lg:flex lg:rounded-lg lg:px-40">
<div class="lg:w-1/2">
<div class="aspect-w-16 aspect-h-9">

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

@@ -43,7 +43,8 @@
</div>
<!-- home -->
<div class="w-full max-w-7xl mx-auto mt-10 p-16" v-else-if="id == 'home'">
<div class="w-full max-w-7xl mx-auto mt-10 px-16" v-else-if="id == 'home'">
<h2
v-if="cta.title"
class="text-3xl mb-2 uppercase leading-tight font-semibold font-heading"