Skip to content

Commit

Permalink
Merge pull request #2243 from kaerunote/add-tokyo-17th
Browse files Browse the repository at this point in the history
Add Tokyo 17th
  • Loading branch information
emorima authored Jan 9, 2025
2 parents 3bdf188 + ab8606f commit 660925f
Show file tree
Hide file tree
Showing 6 changed files with 1,170 additions and 562 deletions.
7 changes: 6 additions & 1 deletion css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,12 @@ url('../images/separator.png') no-repeat center bottom;
url('../images/separator.png') no-repeat center bottom;
background-size: 390px;
}

.tokyo-2025-02-21#promo {
padding-left: 420px;
background: url('../images/railsgirls-sq.png') no-repeat left top;
url('../images/separator.png') no-repeat center bottom;
background-size: 390px;
}
.tokyo#promo {
padding-left: 420px;
background: url('../images/railsgirls-sq.png') no-repeat left top;
Expand Down
8 changes: 7 additions & 1 deletion events.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ <h3>Nagasaki, Japan</h3>
<p>February 14th - 15th 2025</p>
</div>
</a>
<a href="./tokyo-2025-02-21.html" class="event" style="background: url(images/railsgirls-sq.png) 0px -90px no-repeat;">
<div>
<h3>Tokyo, Japan</h3>
<p>February 21th - 22th 2025</p>
</div>
</a>

<!-- Please add past events to this section sorting the most recent on top -->
<hr style="clear:both;" />
Expand Down Expand Up @@ -118,7 +124,7 @@ <h3>Nagoya, Japan</h3>
</div>
</a>

<a href="./tokyo.html" class="event" style="background: center -60px / 100% no-repeat url(images/tokyo/rails_girls_tokyo_16th_600px.png);">
<a href="./tokyo-2024-03-01.html" class="event" style="background: center -60px / 100% no-repeat url(images/tokyo/rails_girls_tokyo_16th_600px.png);">
<div>
<h3>Tokyo, Japan</h3>
<p>March 1st-2nd, 2024</p>
Expand Down
10 changes: 9 additions & 1 deletion events/events.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
{
"events": [
{
"location": "Tokyo, Japan",
"writtenDate": "February 21th - 22th, 2025",
"startDate": "2025-02-21",
"endDate": "2025-02-22",
"imageUrl": "/images/railsgirls-sq.png",
"eventUrl": "/tokyo-2025-02-21.html"
},
{
"location": "Nagasaki, Japan",
"writtenDate": "February 14th - 15th, 2025",
Expand Down Expand Up @@ -38,7 +46,7 @@
"startDate": "2024-3-01",
"endDate": "2024-3-02",
"imageUrl": "/images/tokyo/rails_girls_tokyo_16th_logo.png",
"eventUrl": "/tokyo.html"
"eventUrl": "/tokyo-2024-03-01.html"
},
{
"location": "London, UK",
Expand Down
Loading

0 comments on commit 660925f

Please sign in to comment.