Skip to content

Commit 685da8e

Browse files
Merge main into hoodies
2 parents d65ed1a + 5352661 commit 685da8e

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

‎_data/links.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
- type: divider
22
text: Christmas Meal
33

4-
- text: Grab a ticket to the Christmas Meal!
4+
- text: Grab a ticket to the 2026 Christmas Meal!
55
url: /xmas
66
image: /assets/tex/tex_christmas.svg
77

88
- type: divider
99
text: TeX Plushies
1010

11-
- text: Get a TeX plushie!
11+
- text: Get the TeX plushie crochet pattern!
1212
url: /merch/plushies
1313
image: /assets/images/tex-plushie/20250426_0042_lowres_square.jpg
1414

1515
- type: divider
1616
text: Ball
1717

18-
- text: CSS Ball 2025 Photos
19-
url: /ball/2025/photos
18+
- text: CSS Ball 2026 Photos
19+
url: /ball/2026/photos
2020
image: /assets/tex/tex_ball.svg
2121

2222
- type: divider

‎_layouts/page.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
{% include header.html %}
4040

4141
<main>
42+
{% include xmas_banner.html %}
4243
{{ content }}
4344
</main>
4445

‎_redirects‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@
4646
/ball/2022/photos https://photos.app.goo.gl/bSyPR6fyHGtGDW6h9
4747
/ball/2020/photos https://www.facebook.com/media/set/?set=oa.2609144112656487
4848

49+
# Christmas Meal
50+
/christmas https://www.guildofstudents.com/events/6531/14664/
51+
/christmas-meal /christmas
52+
/xmas /christmas
53+
/xmas-meal /christmas
54+
4955
# Calendar
5056
/calender /calendar
5157
/cal /calendar

0 commit comments

Comments
 (0)