Merge branch 'develop'
# Conflicts: # CHANGELOG.md # npm-shrinkwrap.json # package.json
This commit is contained in:
commit
84eef5ee8c
|
@ -1,7 +1,4 @@
|
||||||
<section
|
<section id="vision" class="bg-black/40 p-5 space-y-10 mx-10 sm:mx-20 xl:mx-40">
|
||||||
id="vision"
|
|
||||||
class="bg-black/40 p-5 lg:p-0 space-y-10 mx-10 sm:mx-20 xl:mx-40"
|
|
||||||
>
|
|
||||||
<h2 class="font-display text-primary font-bold text-xl md:text-2xl uppercase">
|
<h2 class="font-display text-primary font-bold text-xl md:text-2xl uppercase">
|
||||||
Our Vision
|
Our Vision
|
||||||
</h2>
|
</h2>
|
||||||
|
|
|
@ -37,9 +37,7 @@ import meme4Small from "/src/assets/meme-4-small.png";
|
||||||
alt=""
|
alt=""
|
||||||
class="absolute bottom-0 -left-[110px] object-contain xl:-left-5 float-left"
|
class="absolute bottom-0 -left-[110px] object-contain xl:-left-5 float-left"
|
||||||
/>
|
/>
|
||||||
<span
|
<span class="float-right mt-16 w-[300px] space-y-10 mr-5">
|
||||||
class="float-right mt-16 w-[300px] space-y-10 mr-5 overflow-y-auto max-h-[400px]"
|
|
||||||
>
|
|
||||||
<h3 class="font-display text-6xl">Web2</h3>
|
<h3 class="font-display text-6xl">Web2</h3>
|
||||||
<p class="font-body text-2xl text-body">
|
<p class="font-body text-2xl text-body">
|
||||||
Featuring improved gaming, online apps, and video streaming, was
|
Featuring improved gaming, online apps, and video streaming, was
|
||||||
|
@ -60,9 +58,7 @@ import meme4Small from "/src/assets/meme-4-small.png";
|
||||||
alt=""
|
alt=""
|
||||||
class="absolute bottom-0 -left-[110px] xl:-left-5 float-left object-contain"
|
class="absolute bottom-0 -left-[110px] xl:-left-5 float-left object-contain"
|
||||||
/>
|
/>
|
||||||
<span
|
<span class="float-right mt-16 w-[300px] space-y-10 mr-1 xl:mr-5">
|
||||||
class="float-right mt-16 w-[300px] space-y-10 mr-1 xl:mr-5 overflow-y-auto max-h-[400px]"
|
|
||||||
>
|
|
||||||
<h3 class="font-display text-6xl">Crypto/<br />DeFi</h3>
|
<h3 class="font-display text-6xl">Crypto/<br />DeFi</h3>
|
||||||
<p class="font-body text-2xl text-body">
|
<p class="font-body text-2xl text-body">
|
||||||
The advent of Bitcoin sparked innovation, but over time,
|
The advent of Bitcoin sparked innovation, but over time,
|
||||||
|
@ -79,9 +75,7 @@ import meme4Small from "/src/assets/meme-4-small.png";
|
||||||
alt=""
|
alt=""
|
||||||
class="absolute bottom-0 -left-[110px] object-contain xl:-left-5 float-left"
|
class="absolute bottom-0 -left-[110px] object-contain xl:-left-5 float-left"
|
||||||
/>
|
/>
|
||||||
<span
|
<span class="float-right mt-16 w-[300px] space-y-10 mr-1 xl:mr-5">
|
||||||
class="float-right mt-16 w-[300px] space-y-10 mr-1 xl:mr-5 overflow-y-auto max-h-[400px]"
|
|
||||||
>
|
|
||||||
<h3 class="font-display text-6xl">Web3</h3>
|
<h3 class="font-display text-6xl">Web3</h3>
|
||||||
<p class="font-body text-2xl text-body">
|
<p class="font-body text-2xl text-body">
|
||||||
Web3 emerged as a buzzword to replace DeFi, but its meaning varies.
|
Web3 emerged as a buzzword to replace DeFi, but its meaning varies.
|
||||||
|
|
Loading…
Reference in New Issue