Skip to content

Commit 3d0bc77

Browse files
Added one event on same date as a previous one.
Extracted date to show it before all events on same date (date removed from the events card). Styled event further.
1 parent b4a5760 commit 3d0bc77

File tree

3 files changed

+66
-12
lines changed

3 files changed

+66
-12
lines changed

_sass/style.scss

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,19 +313,18 @@ a {
313313
}
314314
}
315315

316-
.upcoming-divider {
316+
.upcoming__divider {
317317
border-bottom: rgba(127, 160, 194, 0.05) 1px solid;
318-
width: 30%;
318+
width: 100%;
319319
margin: 0.25em 0;
320320
}
321321

322322
.upcoming__col {
323323
background: rgba(250, 235, 215, 0.85);
324-
border-top: $black 1px solid;
324+
//border-top: $black 1px solid;
325325
border-right: $black 1px solid;
326326
border-left: $black 1px solid;
327327
min-height: 100%;
328-
margin-top: 1em;
329328
&:first-child {
330329
border-top-left-radius: 5px;
331330
border-top-right-radius: 5px;
@@ -354,6 +353,20 @@ a {
354353
padding-bottom: 0.25em;
355354
}
356355

356+
.upcoming__date {
357+
@extend .title;
358+
color: $blue;
359+
font-size: 1.5em;
360+
margin-top: 0.5em;
361+
margin-bottom: 0.5em;
362+
}
363+
364+
.upcoming__date-divider {
365+
border-bottom: $black 1px solid;
366+
width: 100%;
367+
margin: 0.25em 0;
368+
}
369+
357370
.upcoming__event-title {
358371
@extend .title;
359372
color: $black;
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
title: Test event 1a - on same date as 1
3+
subtitle: test subtitle 1a
4+
project: Pandas
5+
project_logo: static/images/events/pandas_logo_donation.png
6+
project_link: http://pandas.pydata.org/index.html
7+
date: 2018-04-22
8+
time: "18:30"
9+
meetup_link: https://www.meetup.com/Python-Sprints/events/248712103/
10+
event_link:
11+
image:
12+
13+
sponsors:
14+
- quantum_black
15+
---
16+
This will be a follow up of the worldwide #pandasSprint: [https://python-sprints.github.io/pandas/](https://python-sprints.github.io/pandas/)
17+
18+
Beginners to contributing to open source will get a pandas documentation page assigned, and will be guided through the step to make it as good as pandas itself. During the sprint, this step-by-step checklist will help you make your first contribution, and our senior members will help you with any problem.
19+
20+
[https://python-sprints.github.io/pandas/dashboard.html](https://python-sprints.github.io/pandas/dashboard.html)
21+
22+
Advanced contributors will be able to:
23+
- Help reviewing open pull requests
24+
- Experiment with the Sphinx theme of the pandas documentation
25+
- Improve the validation of docstrings
26+
- Refactor the contributing documentation
27+
- And of course mentor more junior contributors
28+
29+
Before the sprint, and to optimise your time, we recommend trying to set up a pandas development environment in your laptop:
30+
31+
[https://python-sprints.github.io/pandas/guide/pandas_setup.html](https://python-sprints.github.io/pandas/guide/pandas_setup.html)
32+
33+
For this sprint, we welcome our new sponsor QuantumBlack.

index.html

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,19 @@ <h2 class="upcoming__title">Events</h2>
5656
</div>
5757
</div>
5858
<div class="upcoming__content row with-padding-x">
59+
{% assign current_date = "" %}
5960
{% for post in posts %}
6061
{% include get_host_sponsor.html event = post %}
6162
<div class="upcoming__col col-md-12 no-padding-x">
6263
<div class="row">
6364
<div class="col-12">
65+
{% unless post.date == current_date %}
66+
<p class="upcoming__date">
67+
<i class="upcoming__icon far fa-calendar-alt"></i>{{ post.date | date: "%e %B %Y" }}, {{ post.time }}
68+
</p>
69+
<!--<hr class="upcoming__date-divider">-->
70+
{% endunless %}
71+
{% assign current_date = post.date %}
6472
<h2 class="upcoming__event-title"> {{ post.title }}</h2>
6573
</div>
6674
</div>
@@ -70,8 +78,7 @@ <h2 class="upcoming__event-subtitle"> {{ post.subtitle }}</h2>
7078
</div>
7179
</div>
7280
<div class="row">
73-
<div class="col-12 pr-0">
74-
<hr class="upcoming-divider">
81+
<div class="col-12">
7582
<div class="row">
7683
<div class="col-6 no-padding-x">
7784
<div class="col-12 no-padding-x">
@@ -80,14 +87,15 @@ <h2 class="upcoming__event-subtitle"> {{ post.subtitle }}</h2>
8087
</p>
8188
</div>
8289
</div>
83-
<div class="col-6 no-padding-x">
84-
<div class="col-12 no-padding-x">
85-
<p class="upcoming__paragraph text-right mr-2">
86-
<i class="upcoming__icon far fa-calendar-alt"></i>{{ post.date | date: "%e %B %Y" }}, {{ post.time }}
87-
</p>
88-
</div>
90+
<div class="col-6 no-padding-x text-right">
91+
<a class="upcoming__button btn" href="{{ post.url }}">
92+
<i class="upcoming__button-icon fas fa-info-circle"></i>
93+
</a>
8994
</div>
9095
</div>
96+
{% unless forloop.last %}
97+
<hr class="upcoming__divider">
98+
{% endunless %}
9199
</div>
92100
</div>
93101
</div>

0 commit comments

Comments
 (0)