fix conflict

This commit is contained in:
2021-09-19 15:29:47 +02:00
40 changed files with 72 additions and 18 deletions

View File

@@ -350,6 +350,21 @@
</div> -->
</div>
<div
class="flex flex-wrap text-center lg:text-left lg:pt-10 -mx-2"
v-else-if="id == 'token'"
>
<div class="px-2 lg:mt-10 order-1 lg:order-none mx-auto text-center">
<div class="w-1/2 mx-auto px-2 self-center">
<g-image :src="img" :alt="altImg" />
</div>
<h2 class="text-8xl uppercase mb-6 mt-20 leading-none font-heading">
{{ title }}
</h2>
<div class="mb-8 text-2xl leading-relaxed" v-html="excerpt"></div>
</div>
</div>
<div
class="flex flex-wrap text-center lg:text-left lg:pt-10 -mx-2"
v-else-if="id == 'grid'"