Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	CHANGELOG.md
#	npm-shrinkwrap.json
#	package.json
This commit is contained in:
Derrick Hammer 2023-08-13 19:01:13 -04:00
commit 8176c3761b
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
2 changed files with 4 additions and 13 deletions

View File

@ -1,7 +1,4 @@
<section
id="vision"
class="bg-black/40 p-5 lg:p-0 space-y-10 mx-10 sm:mx-20 xl:mx-40"
>
<section id="vision" class="bg-black/40 p-5 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">
Our Vision
</h2>

View File

@ -37,9 +37,7 @@ import meme4Small from "/src/assets/meme-4-small.png";
alt=""
class="absolute bottom-0 -left-[110px] object-contain xl:-left-5 float-left"
/>
<span
class="float-right mt-16 w-[300px] space-y-10 mr-5 overflow-y-auto max-h-[400px]"
>
<span class="float-right mt-16 w-[300px] space-y-10 mr-5">
<h3 class="font-display text-6xl">Web2</h3>
<p class="font-body text-2xl text-body">
Featuring improved gaming, online apps, and video streaming, was
@ -60,9 +58,7 @@ import meme4Small from "/src/assets/meme-4-small.png";
alt=""
class="absolute bottom-0 -left-[110px] xl:-left-5 float-left object-contain"
/>
<span
class="float-right mt-16 w-[300px] space-y-10 mr-1 xl:mr-5 overflow-y-auto max-h-[400px]"
>
<span class="float-right mt-16 w-[300px] space-y-10 mr-1 xl:mr-5">
<h3 class="font-display text-6xl">Crypto/<br />DeFi</h3>
<p class="font-body text-2xl text-body">
The advent of Bitcoin sparked innovation, but over time,
@ -79,9 +75,7 @@ import meme4Small from "/src/assets/meme-4-small.png";
alt=""
class="absolute bottom-0 -left-[110px] object-contain xl:-left-5 float-left"
/>
<span
class="float-right mt-16 w-[300px] space-y-10 mr-1 xl:mr-5 overflow-y-auto max-h-[400px]"
>
<span class="float-right mt-16 w-[300px] space-y-10 mr-1 xl:mr-5">
<h3 class="font-display text-6xl">Web3</h3>
<p class="font-body text-2xl text-body">
Web3 emerged as a buzzword to replace DeFi, but its meaning varies.