Skip to content

Commit 4b30d80

Browse files
AlexBlokhAlexBlokh
committed
Merge commit 'b58a34752dad6e7b376864dfbb77992d043aded9'
2 parents 10aa7ee + b58a347 commit 4b30d80

File tree

11 files changed

+220
-4
lines changed

11 files changed

+220
-4
lines changed

‎public/svg/edb_logo_dark.svg

Lines changed: 3 additions & 0 deletions
Loading

‎public/svg/edb_logo_light.svg

Lines changed: 3 additions & 0 deletions
Loading

‎public/svg/edb_logo_small.svg

Lines changed: 18 additions & 0 deletions
Loading

‎src/components/LandingPage/LandingPage.astro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ const runtimes: string[] = [
2424
"Browser",
2525
];
2626
const databases: string[] = [
27+
"EdgeDB",
2728
"PlanetScale",
2829
"Neon",
2930
"Vercel Postgres",

‎src/components/LandingPage/SponsorsLine/SponsorsLine.astro

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,10 @@
358358
height: 66px;
359359
}
360360

361+
#git-link {
362+
height: fit-content;
363+
}
364+
361365
.card_image img {
362366
width: 100%;
363367
height: 100%;

‎src/components/LandingPage/Supporting/Databases.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,19 @@ const Databases: {
136136
},
137137
sponsorUrl: "https://driz.link/tembo",
138138
},
139+
EdgeDB: {
140+
imageSrc: {
141+
lightThemeSrc: "/public/svg/edb_logo_small.svg",
142+
darkThemeSrc: "/public/svg/edb_logo_small.svg",
143+
},
144+
lightStyle: {
145+
width: 26,
146+
},
147+
darkStyle: {
148+
width: 26,
149+
},
150+
sponsorUrl: "https://driz.link/edgedb",
151+
},
139152
};
140153

141154
export default Databases;

‎src/components/layout/AsidePosts.astro

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,43 @@
160160
>
161161
</div>
162162
</a>
163+
<a href="https://drizzle.run" class="aside-posts__wrap">
164+
<div class="aside-posts__image">
165+
<div class="aside-posts__image--learn">
166+
<svg
167+
xmlns="http://www.w3.org/2000/svg"
168+
width="18"
169+
height="18"
170+
viewBox="0 0 24 24"
171+
>
172+
<path
173+
class="play-path"
174+
stroke="currentColor"
175+
stroke-linecap="round"
176+
stroke-linejoin="round"
177+
stroke-width="1.5" d="M6.906 4.537A.6.6 0 0 0 6 5.053v13.894a.6.6 0 0 0 .906.516l11.723-6.947a.6.6 0 0 0 0-1.032L6.906 4.537Z"
178+
></path>
179+
</svg>
180+
</div>
181+
</div>
182+
<div class="aside-posts__text">Drizzle Run</div>
183+
<div class="aside-posts__arrow-right">
184+
<svg
185+
xmlns="http://www.w3.org/2000/svg"
186+
width="24"
187+
height="24"
188+
viewBox="0 0 24 24"
189+
fill="none"
190+
stroke="currentColor"
191+
stroke-width="2"
192+
stroke-linecap="round"
193+
stroke-linejoin="round"
194+
class="feather feather-arrow-right"
195+
><line x1="5" y1="12" x2="19" y2="12"></line><polyline
196+
points="12 5 19 12 12 19"></polyline></svg
197+
>
198+
</div>
199+
</a>
163200
<div class="goods__wrap">
164201
<div class="goods__text">Our goodies!</div>
165202
</div>
@@ -184,6 +221,7 @@
184221
.aside-posts__container:hover .aside-posts__wrap .aside-posts__image {
185222
margin-left: 12px;
186223
transform: scale(1);
224+
opacity: 1;
187225
}
188226

189227
.aside-posts__container:hover .aside-posts__wrap .aside-posts__text {
@@ -257,6 +295,10 @@
257295
margin-top: -41px;
258296
}
259297

298+
.aside-posts__wrap:nth-child(5) {
299+
margin-top: -41px;
300+
}
301+
260302
.aside-posts__wrap:nth-child(2) .aside-posts__image {
261303
margin-left: 32px;
262304
}
@@ -269,6 +311,11 @@
269311
margin-left: 80px;
270312
}
271313

314+
.aside-posts__wrap:nth-child(5) .aside-posts__image {
315+
margin-left: 80px;
316+
opacity: 0;
317+
}
318+
272319

273320
.aside-posts__wrap:hover {
274321
background-color: #eff0f3;
@@ -301,7 +348,7 @@
301348
margin: 12px 8px 12px 12px;
302349
position: relative;
303350
z-index: 6;
304-
transition: margin-left 0.15s, transform 0.15s;
351+
transition: margin-left 0.15s, transform 0.15s, opacity 0.15s;
305352
transform: scale(0.8);
306353
}
307354

@@ -354,6 +401,14 @@
354401
width: 16px;
355402
color: #000;
356403
}
404+
405+
.play-path {
406+
fill: #c4c4c4;
407+
}
408+
409+
html.dark .play-path {
410+
fill: #333333;
411+
}
357412
</style>
358413

359414
<style is:global>

‎src/components/layout/AsideSponsors.astro

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,61 @@ const getStyleString = (style: CSSProperties) => {
88
}, "");
99
};
1010
11+
const heroSponsors = s.filter(({tier}) => tier.name === '$2500 a month');
12+
13+
const goldSponsors = s.filter(({tier}) => tier.name === '$1000 a month');
14+
1115
const slicedSponsors = [];
1216
13-
for (let i = 0; i < s.length - 1; i += 2) {
14-
let items = s.slice(i, i + 2);
17+
for (let i = 0; i < goldSponsors.length - 1; i += 2) {
18+
let items = goldSponsors.slice(i, i + 2);
1519
slicedSponsors.push(items);
1620
}
1721
---
1822

1923
<div class="aside-sponsors__wrap">
24+
{
25+
heroSponsors.map((sponsor) => (
26+
<div class="aside-sponsors__row">
27+
<a
28+
class:list={["aside-sponsors__sponsor", "aside-sponsors__hero-sponsor" ]}
29+
href={`https://${sponsor.sponsorEntity.login}`}
30+
target="_blank"
31+
rel={sponsor.followLink ? "" : "nofollow"}
32+
>
33+
<div
34+
class="aside-sponsors__sponsor-image"
35+
id="aside-sponsors-img-wrapper"
36+
>
37+
<img
38+
class="aside-sponsors__light-img"
39+
loading="lazy"
40+
src={
41+
"data:image/svg+xml;base64," +
42+
btoa(sponsor.sponsorEntity.avatarUrl)
43+
}
44+
style={getStyleString(sponsor.lightStyle || {})}
45+
/>
46+
<img
47+
class="aside-sponsors__dark-img"
48+
loading="lazy"
49+
src={
50+
"data:image/svg+xml;base64," +
51+
btoa(sponsor.sponsorEntity.avatarUrl)
52+
}
53+
alt={sponsor.sponsorEntity.name || sponsor.sponsorEntity.login}
54+
style={getStyleString(sponsor.darkStyle || {})}
55+
/>
56+
</div>
57+
{!!sponsor.popover && (
58+
<div class="popover">
59+
{sponsor.popover}
60+
</div>
61+
)}
62+
</a>
63+
</div>
64+
))
65+
}
2066
{
2167
slicedSponsors.map((slice) => (
2268
<div class="aside-sponsors__row">
@@ -336,6 +382,15 @@ for (let i = 0; i < s.length - 1; i += 2) {
336382
filter: none !important;
337383
}
338384

385+
.aside-sponsors__hero-sponsor .aside-sponsors__sponsor-image {
386+
transition: filter 0.2s;
387+
display: flex;
388+
align-items: center;
389+
justify-content: center;
390+
height: unset;
391+
width: unset;
392+
}
393+
339394
.aside-sponsors__sponsor-image {
340395
transition: filter 0.2s;
341396
display: flex;

‎src/components/layout/CarbonCard.astro

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,10 @@
8383
text-transform: uppercase;
8484
transition: color .25s;
8585
}
86+
87+
@media screen and (max-height: 856px) {
88+
.carbon-card-wrap {
89+
display: none;
90+
}
91+
}
8692
</style>

‎src/data/asideS.ts

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { type ISponsor, ImageType } from "@/types/Sponsors";
33
export const sponsorsData: ISponsor[] = [
44
{
55
tier: {
6-
name: "$1,000 one time",
6+
name: "$1000 a month",
77
isOneTime: false,
88
},
99
sponsorEntity: {
@@ -211,6 +211,36 @@ export const sponsorsData: ISponsor[] = [
211211
'url("/images/tembo.png") 0% 0% / contain no-repeat content-box',
212212
},
213213
},
214+
{
215+
tier: {
216+
name: "$2500 a month",
217+
isOneTime: false,
218+
},
219+
sponsorEntity: {
220+
__typename: "Organization",
221+
login: "driz.link/edgedb",
222+
name: "EdgeDB",
223+
avatarUrl:
224+
'<svg width="1200" height="1200" viewBox="0 0 1200 1200" fill="none" xmlns="http://www.w3.org/2000/svg"></svg>',
225+
},
226+
createdAt: "2024-06-07T13:32:16Z",
227+
isActive: true,
228+
imageType: ImageType.SVG,
229+
darkStyle: {
230+
width: "72px",
231+
filter: "grayscale(1) brightness(2) opacity(0.3)",
232+
background:
233+
'url("/svg/edb_logo_light.svg") 0% 0% / contain no-repeat content-box',
234+
"background-position": "center",
235+
},
236+
lightStyle: {
237+
width: "72px",
238+
filter: "grayscale(1) opacity(0.6)",
239+
background:
240+
'url("/svg/edb_logo_dark.svg") 0% 0% / contain no-repeat content-box',
241+
"background-position": "center",
242+
},
243+
},
214244
{
215245
tier: {
216246
name: "$1000 a month",

0 commit comments

Comments
 (0)