Skip to content

Commit 0a42e80

Browse files
committed
Cleanup: Hero and finaid.
1 parent e0a95d7 commit 0a42e80

File tree

10 files changed

+22
-2075
lines changed

10 files changed

+22
-2075
lines changed
File renamed without changes.
File renamed without changes.

public/icons/calendar.svg

Lines changed: 0 additions & 4 deletions
This file was deleted.

public/icons/pin.svg

Lines changed: 0 additions & 4 deletions
This file was deleted.
File renamed without changes.

src/components/hero2/hero.astro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
import { Image } from "astro:assets";
3-
import heroImage from "./conference_photo.jpg";
3+
import heroImage from "/public/images/conference_photo.jpg";
44
55
import IconWithLabel from "./icon-label.astro";
66
import Button from "@ui/Button.astro";
@@ -98,10 +98,10 @@ const action2 = "/sponsorship/sponsor/";
9898
<!-- First 2x1 Grid -->
9999
<div class="grid grid-cols-1 md:grid-cols-2 gap-4 m-10">
100100
<div>
101-
<IconWithLabel icon="pin" label="Prague, Czech Republic" />
101+
<IconWithLabel icon="map-pin" label="Prague, Czech Republic" />
102102
</div>
103103
<div>
104-
<IconWithLabel icon="calendar" label="14-20 July, 2025" />
104+
<IconWithLabel icon="calendar-days" label="14-20 July, 2025" />
105105
</div>
106106
</div>
107107

src/components/hero2/hero.svg

Lines changed: 0 additions & 1988 deletions
This file was deleted.

src/components/hero2/icon-label.astro

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
---
22
const { icon, label } = Astro.props;
33
4-
const iconPath = `/icons/${icon}.svg`;
4+
import Icon from "@ui/Icon.astro";
55
---
66

77
<!--<div class="flex items-center space-x-3">--><!-- Circle with SVG Icon --><!--<div class="w-10 h-10 bg-gray-200 rounded-full flex items-center justify-center">--><!-- <img src={iconPath} alt={label} class="w-6 h-6" />--><!--</div>-->
88
<div class="flex items-center space-x-3 px-6">
99
<div
1010
class="w-20 h-20 flex items-center justify-center rounded-full bg-[#D4D5E4]"
1111
>
12-
<img src={iconPath} alt={label} class="w-10 h-10" />
12+
<Icon name={icon} size="fa-2x" />
1313
</div>
14+
<<<<<<< Updated upstream
1415
<!--<span class="text-lg font-medium text-[#7B7EB9]">Label</span>-->
1516
<span class="text-xl font-medium text-[#7B7EB9]">{label}</span>
17+
=======
18+
<span class="pl-2 text-xl font-medium text-[##18223B]"> {label}</span>
19+
>>>>>>> Stashed changes
1620
</div>
1721
<!--</div>-->
1822
<style>

src/content/pages/finaid.mdx

Lines changed: 10 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -92,80 +92,16 @@ early.**
9292

9393
**Note:** dates in the timeline follow the [Anywhere on Earth][AoE] convention.
9494

95-
<table className="mt-8 finaid-timeline">
96-
<tbody className="text-xl">
97-
<tr>
98-
<td>8 March 2025</td>
99-
<td></td>
100-
<td>Applications open</td>
101-
</tr>
102-
<tr className="font-bold">
103-
<td>4 April 2025</td>
104-
<td>
105-
<img
106-
src="/img/accents/finaid-round1.svg"
107-
className="findaid-accent-round-marker"
108-
alt="round one" />
109-
</td>
110-
<td>Deadline for submitting first-round applications</td>
111-
</tr>
112-
<tr>
113-
<td>25 April 2025</td>
114-
<td>
115-
<img
116-
src="/img/accents/finaid-round1.svg"
117-
className="findaid-accent-round-marker"
118-
alt="round one" />
119-
</td>
120-
<td>First round of grant notifications</td>
121-
</tr>
122-
<tr>
123-
<td>2 May 2025</td>
124-
<td>
125-
<img
126-
src="/img/accents/finaid-round1.svg"
127-
className="findaid-accent-round-marker"
128-
alt="round one" />
129-
</td>
130-
<td>Deadline to accept a first-round grant</td>
131-
</tr>
132-
<tr className="font-bold">
133-
<td>9 May 2025</td>
134-
<td>
135-
<img
136-
src="/img/accents/finaid-round2.svg"
137-
className="findaid-accent-round-marker"
138-
alt="round two" />
139-
</td>
140-
<td>Deadline for submitting second-round applications[^round-1-vs-round-2]</td>
141-
</tr>
142-
<tr>
143-
<td>30 May 2025</td>
144-
<td className="finaid-accent">
145-
<img
146-
src="/img/accents/finaid-round2.svg"
147-
className="findaid-accent-round-marker"
148-
alt="round two" />
149-
</td>
150-
<td>Second round of grant notifications</td>
151-
</tr>
152-
<tr>
153-
<td>6 June 2025</td>
154-
<td>
155-
<img
156-
src="/img/accents/finaid-round2.svg"
157-
className="findaid-accent-round-marker"
158-
alt="round two" />
159-
</td>
160-
<td>Deadline to accept a second-round grant</td>
161-
</tr>
162-
<tr>
163-
<td>25 July 2025</td>
164-
<td></td>
165-
<td>Deadline for submitting receipts/invoices</td>
166-
</tr>
167-
</tbody>
168-
</table>
95+
| |      | |
96+
|---|-------|---|
97+
| 8 March 2025 || Applications open |
98+
| **4 April 2025** | ![round one](/finaid-round1.svg) | **Deadline for submitting first-round applications** |
99+
| 25 April 2025 | ![round one](/finaid-round1.svg) | First round of grant notifications |
100+
| 2 May 2025 | ![round one](/finaid-round1.svg) | Deadline to accept a first-round grant |
101+
| **9 May 2025** | ![round two](/finaid-round2.svg) | **Deadline for submitting second-round applications [1](/finaid#user-content-fn-round-1-vs-round-2)** |
102+
| 30 May 2025 | ![round two](/finaid-round2.svg) | Second round of grant notifications |
103+
| 6 June 2025 | ![round two](/finaid-round2.svg) | Deadline to accept a second-round grant |
104+
| 25 July 2025 || Deadline for submitting receipts/invoices |
169105

170106
[^round-1-vs-round-2]: If you've already applied for round 1, you don't have to
171107
reapply for round 2. Your application will automatically be considered for round

src/styles/global.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,9 @@ p.cross::after {
246246
--min-fs: 1;
247247
--max-fs: 1.5;
248248
}
249+
td img {
250+
margin: 0;
251+
}
249252
}
250253

251254
h1,

0 commit comments

Comments
 (0)