Skip to content

Commit

Permalink
Merge branch 'master' into fix-typos-on-press-page
Browse files Browse the repository at this point in the history
  • Loading branch information
dnlwlsn authored Aug 15, 2024
2 parents 1591fb6 + 62a4e09 commit 64b1d26
Show file tree
Hide file tree
Showing 5 changed files with 261 additions and 303 deletions.
12 changes: 9 additions & 3 deletions events.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,9 @@
·
<a href="https://www.kimonolabs.com/api/9ewmrnqw?apikey=fmZ7aEB4vPZjwmuUFb0QZjVIliSGYuCK">API</a>
</div>
<!-- Please add upcoming events to this section sorting the soonest on top -->

<h2>Upcoming Events</h2>

<!-- Please add past events to this section sorting the most recent on top -->
<!-- Please add upcoming events to this section sorting the soonest on top -->

<a href="./melbourne.html" class="event" style="background: url(images/railsgirls-sq.png) 0px -90px no-repeat;">
<div>
Expand All @@ -87,6 +85,14 @@ <h3>Melbourne, Australia</h3>
</div>
</a>

<a href="./nantes.html" class="event" style="background: url(images/railsgirls-sq.png) 0px -90px no-repeat;">
<div>
<h3>Nantes, France</h3>
<p>September 27th - 28th, 2024</p>
</div>
</a>

<!-- Please add past events to this section sorting the most recent on top -->
<hr style="clear:both;" />

<h2>Past Events</h2>
Expand Down
8 changes: 8 additions & 0 deletions events/events.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
{
"events": [
{
"location": "Nantes, France",
"writtenDate": "September 27th - 28th, 2024",
"startDate": "2024-09-27",
"endDate": "2024-09-28",
"imageUrl": "/images/railsgirls-sq.png",
"eventUrl": "/nantes.html"
},
{
"location": "Fukuoka, Japan",
"writtenDate": "June 7th, 2024",
Expand Down
Binary file added images/nantes/clever_cloud_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/nantes/nantes_rb_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 64b1d26

Please sign in to comment.