Skip to content

Commit b5b0cde

Browse files
authored
Merge branch 'ep2025' into ep2025-image
2 parents d3620b1 + 2d33f55 commit b5b0cde

File tree

17 files changed

+24
-14
lines changed

17 files changed

+24
-14
lines changed

.env.preview

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
EP_SESSIONS_API="https://static.europython.eu/programme/ep2025/releases/current/sessions.json"
2-
EP_SPEAKERS_API="https://static.europython.eu/programme/ep2025/releases/current/speakers.json"
1+
EP_SESSIONS_API="https://static.europython.eu/programme/ep2024/releases/current/sessions.json"
2+
EP_SPEAKERS_API="https://gist.githubusercontent.com/nikoshell/24f8c99de3758dc4ed1391876c382b43/raw/bdf11fe89e5010f35dc1351e9b71c02a19adefe2/24speakers.json"
3+
EP_SCHEDULE_API="https://static.europython.eu/programme/ep2024/releases/current/schedule.json"

.github/workflows/preview.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55

66
jobs:
77
preview:
8+
if: github.event.pull_request.head.repo.fork == false
89
name: Run preview
910
runs-on: ubuntu-latest
1011
env:

public/EuroPython2025_logo.png

7.54 KB
Loading

public/favicon.ico

-25.3 KB
Binary file not shown.

public/logo.png

19.6 KB
Loading

public/logo.svg

Lines changed: 1 addition & 0 deletions
Loading

src/components/BaseHead.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const { title, description, image = "/social-card.png" } = Astro.props;
1313
<!-- Global Metadata -->
1414
<meta charset="utf-8" />
1515
<meta name="viewport" content="width=device-width,initial-scale=1" />
16-
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
16+
<link rel="icon" type="image/svg+xml" href="/favicon.ico" />
1717
<meta name="generator" content="Astro" />
1818
<link rel="sitemap" href="/sitemap-index.xml" />
1919

src/components/header/header-logo.astro

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ interface Props {
77
---
88

99
<a href="/">
10-
<Logo className="w-11 h-auto mr-4 block md:hidden" />
11-
<Logo className="h-auto hidden md:block w-full pr-3 lg:pr-8" />
10+
<img class="md:block block w-[44px] h-[44px] md:w-[85px] md:h-[85px] " src="/EuroPython2025_logo.png" />
1211
</a>

src/components/hero2/hero.astro

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
import { Logo } from "../logo";
32
import { Image } from "astro:assets";
43
import heroImage from "./conference_photo.jpg";
54
@@ -83,7 +82,7 @@ const action2 = "/sponsorship/sponsor/";
8382
<div class="prose-xl relative z-10 text-center">
8483
<div class="flex items-center space-x-3 p-10 md:mt-20 justify-center">
8584
<div class="w-200 h-200 flex items-center justify-center">
86-
<Logo className="h-full block md:w-full lg:w-[200px] pr-3 lg:pr-8" />
85+
<img class="h-full block md:w-full lg:w-[200px] pr-3 lg:pr-8" src="/logo.png" height="188" width="188" />
8786
</div>
8887
<h1 class="text-5xl md:text-8xl lg:text-9xl m-0 font-bold text-[#17223A]">
8988
EuroPython

src/components/sections/updates.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ let deadlines = await getCollection("deadlines");
99
deadlines = deadlines
1010
.sort((a, b) => a.slug.localeCompare(b.slug))
1111
.reverse()
12-
.slice(0, 3);
12+
.slice(0, 5);
1313
1414
---
1515
<section class="prose-xl m-0 my-12 p-0">

0 commit comments

Comments
 (0)