Merge branch 'develop' of git.lumeweb.com:LumeWeb/lumeweb.com into develop

This commit is contained in:
Derrick Hammer 2023-08-19 11:10:06 -04:00
commit 5f92ed7d7a
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
5 changed files with 143 additions and 125 deletions

View File

@ -1,3 +1,17 @@
# [0.3.0-develop.4](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.3.0-develop.3...v0.3.0-develop.4) (2023-08-19)
### Bug Fixes
* meme headline and donate button ([917a818](https://git.lumeweb.com/LumeWeb/lumeweb.com/commit/917a818c8375c0c880e5c4b3bf5760698bc739f1))
# [0.3.0-develop.3](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.3.0-develop.2...v0.3.0-develop.3) (2023-08-19)
### Features
* add sitemap ([599bba5](https://git.lumeweb.com/LumeWeb/lumeweb.com/commit/599bba5c352ead5981732d68a5c83cc42a40cb65))
# [0.3.0-develop.2](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.3.0-develop.1...v0.3.0-develop.2) (2023-08-19) # [0.3.0-develop.2](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.3.0-develop.1...v0.3.0-develop.2) (2023-08-19)

4
npm-shrinkwrap.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "@lumeweb/lumeweb.com", "name": "@lumeweb/lumeweb.com",
"version": "0.3.0-develop.2", "version": "0.3.0-develop.4",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@lumeweb/lumeweb.com", "name": "@lumeweb/lumeweb.com",
"version": "0.3.0-develop.2", "version": "0.3.0-develop.4",
"dependencies": { "dependencies": {
"@astrojs/react": "^2.1.1", "@astrojs/react": "^2.1.1",
"@astrojs/sitemap": "^2.0.2", "@astrojs/sitemap": "^2.0.2",

View File

@ -1,7 +1,7 @@
{ {
"name": "@lumeweb/lumeweb.com", "name": "@lumeweb/lumeweb.com",
"type": "module", "type": "module",
"version": "0.3.0-develop.2", "version": "0.3.0-develop.4",
"private": true, "private": true,
"repository": { "repository": {
"type": "git", "type": "git",

View File

@ -12,7 +12,7 @@ import backgroud from "/src/assets/why-bg-2.png";
src={backgroud.src} src={backgroud.src}
class="absolute xl:relative -z-10 min-w-[1000px] h-[750px] -mx-10 md:-mx-20 lg:-mx-40" class="absolute xl:relative -z-10 min-w-[1000px] h-[750px] -mx-10 md:-mx-20 lg:-mx-40"
/> />
<div> <div class="py-5 px-2 lg:px-0">
<FeaturedGroup <FeaturedGroup
subtitle="Why should I donate to Lume?" subtitle="Why should I donate to Lume?"
title="Help us break the pattern" title="Help us break the pattern"

View File

@ -12,7 +12,11 @@ import meme4Small from "/src/assets/meme-4-small.png";
<section <section
class="flex flex-col w-full border-y border-dark-aquamarine divide-y divide-dark-aquamarine lg:h-[1200px]" class="flex flex-col w-full border-y border-dark-aquamarine divide-y divide-dark-aquamarine lg:h-[1200px]"
> >
<h3 class="font-display text-4xl md:text-6xl font-bold mb-5 font-display text-primary ">Web3's Current Path</h3> <h3
class="font-display text-4xl md:text-6xl font-bold p-5 uppercase bg-dark-aquamarine text-primary"
>
Web3's Current Path
</h3>
<!-- MEME GRID BIG --> <!-- MEME GRID BIG -->
<div <div
class="hidden lg:flex flex-1 flex-row w-full divide-x divide-dark-aquamarine" class="hidden lg:flex flex-1 flex-row w-full divide-x divide-dark-aquamarine"
@ -60,7 +64,7 @@ import meme4Small from "/src/assets/meme-4-small.png";
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 class="float-right mt-16 w-[300px] space-y-10 mr-1 xl:mr-5"> <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> <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,
centralization increased. Factors such as the influx of big money, centralization increased. Factors such as the influx of big money,
@ -99,7 +103,7 @@ import meme4Small from "/src/assets/meme-4-small.png";
the age of AOL dial-up and similar networks where you got web, email, the age of AOL dial-up and similar networks where you got web, email,
shopping, and chat all in one place.. shopping, and chat all in one place..
</p> </p>
<img src={meme1Small.src} class="-mb-10 w-60 self-center"/> <img src={meme1Small.src} class="-mb-10 w-60 self-center" />
</div> </div>
<div class="lg:hidden flex flex-col gap-8 py-10 px-8"> <div class="lg:hidden flex flex-col gap-8 py-10 px-8">
<h3 class="font-display text-3xl">Web2</h3> <h3 class="font-display text-3xl">Web2</h3>
@ -119,7 +123,7 @@ import meme4Small from "/src/assets/meme-4-small.png";
(internet providers and hosting), who also play a part in controlling your (internet providers and hosting), who also play a part in controlling your
web, be it for your "safety", or other reasons. web, be it for your "safety", or other reasons.
</p> </p>
<img src={meme2Small.src} class="-mb-10 w-60 self-center"/> <img src={meme2Small.src} class="-mb-10 w-60 self-center" />
</div> </div>
<div class="lg:hidden flex flex-col gap-8 py-10 px-8"> <div class="lg:hidden flex flex-col gap-8 py-10 px-8">
<h3 class="font-display text-3xl">Crypto/DeFi</h3> <h3 class="font-display text-3xl">Crypto/DeFi</h3>
@ -143,7 +147,7 @@ import meme4Small from "/src/assets/meme-4-small.png";
<p class="font-body text-body text-xl"> <p class="font-body text-body text-xl">
It became one large crypto casino. It became one large crypto casino.
</p> </p>
<img src={meme3Small.src} class="-mb-10 w-60 self-center"/> <img src={meme3Small.src} class="-mb-10 w-60 self-center" />
</div> </div>
<div class="lg:hidden flex flex-col gap-8 py-10 px-8"> <div class="lg:hidden flex flex-col gap-8 py-10 px-8">
<h3 class="font-display text-3xl">Web3</h3> <h3 class="font-display text-3xl">Web3</h3>
@ -165,7 +169,7 @@ import meme4Small from "/src/assets/meme-4-small.png";
There needs to be a balance here between free markets/money and public There needs to be a balance here between free markets/money and public
goods/infra, and so far things are way out of wack and need to be fixed. goods/infra, and so far things are way out of wack and need to be fixed.
</p> </p>
<img src={meme4Small.src} class="-mb-10 w-60 self-center"/> <img src={meme4Small.src} class="-mb-10 w-60 self-center" />
</div> </div>
<!-- MEME GRID SMALL --> <!-- MEME GRID SMALL -->
</section> </section>