Skip to content

Commit 50b7d99

Browse files
Tomasz-KluczkowskiTomasz-Kluczkowski
committed
Merge branch 'fix_sponsor_columns_and_links'
2 parents 9f58a89 + 05d1bdb commit 50b7d99

38 files changed

+626
-371
lines changed

‎_includes/event.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ <h2 class="section-title">Recent Events</h2>
3838
<div class="events__spacer"></div>
3939
<div class="events__img-container">
4040
<div class="events__img-overlay">
41-
<!--<a class="events__link" href="{{ post.link }}" target="_blank">-->
4241
<a class="events__link" href="{{ post.url }}">
4342
<i class="events__icon fas fa-external-link-square-alt"></i>
4443
</a>

‎_includes/footer.html‎

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,39 @@ <h2 class="footer__section-title">Find Us Online</h2>
99
<div class="col-md-6">
1010
<h2 class="footer__section-title">Our Sponsors</h2>
1111
<hr class="footer__divider">
12-
<div class="row">
13-
<div class="footer__sponsor-col col-lg-12 col-xlg-6">
14-
<a class="footer__sponsor-link" href="https://www.python.org/psf/">
15-
<img class="footer__img" src="{{ site.baseurl }}/static/images/sponsors/python_software_foundation.png">
16-
</a>
17-
<a class="footer__sponsor-link" href="https://www.linkedin.com/in/hamishpitkeathly/">
18-
<img class="footer__img" src="{{ site.baseurl }}/static/images/sponsors/harvey_nash.png">
19-
</a>
20-
</div>
21-
<div class="footer__sponsor-col col-lg-12 col-xlg-6">
22-
<a class="footer__sponsor-link" href="https://www.touchsurgery.com/jobs.html">
23-
<img class="footer__img" src="{{ site.baseurl }}/static/images/sponsors/touch_surgery.png">
24-
</a>
25-
<a class="footer__sponsor-link" href="https://www.bloomberg.com/careers/">
26-
<img class="footer__img" src="{{ site.baseurl }}/static/images/sponsors/bloomberg.png">
27-
</a>
12+
{% comment %}
13+
Assume number of sponsors is even. We are going to create rows of 2 sponsors in each.
14+
If not even the last row must contain 1 sponsor and be terminated with appropriate tags.
15+
{% endcomment %}
16+
17+
{% assign num_of_sponsors_even = true %}
18+
{% assign sponsors = "" | split: ',' %}
19+
{% for sponsor in site.sponsors %}
20+
{% assign sponsors = sponsors | push: sponsor %}
21+
{% endfor %}
22+
{% assign num_of_sponsors = sponsors | size %}
23+
{% if num_of_sponsors | modulo: 2 > 0 %}
24+
{% assign num_of_sponsors_even = false %}
25+
{% endif %}
26+
{% assign num_of_rows = num_of_sponsors | divided_by: 2 | floor %}
27+
{% assign items_per_row = 1 %}
28+
29+
{% for row in (0..num_of_rows) %}
30+
{% if forloop.last == true and num_of_sponsors_even == false %}
31+
{% assign items_per_row = 0 %}
32+
{% endif %}
33+
<div class="row">
34+
{% for col in (0..items_per_row) %}
35+
{% assign sponsor_index = row | times: 2 | plus: col %}
36+
{% assign sponsor = sponsors[sponsor_index] %}
37+
<div class="footer__sponsor-col col-md-12 col-lg-6">
38+
<a class="footer__sponsor-link" href="{{ sponsor.sponsor_link }}">
39+
<img class="footer__img" src="{{ site.baseurl }}/{{ sponsor.sponsor_logo }}">
40+
</a>
41+
</div>
42+
{% endfor %}
2843
</div>
29-
</div>
44+
{% endfor %}
3045
</div>
3146
<div class="col-md-3">
3247
<h2 class="footer__section-title">Python Sprints</h2>

‎_includes/head.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@
1414
{{ site.title }}
1515
{% endif %}
1616
</title>
17-
</head>
18-
17+
</head>

‎_includes/inline_style_index.html‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<!--Create array of future events-->
2+
{% assign upcoming_events = "" | split: ',' %}
3+
{% assign curDate = site.time | date: "%s" %}
4+
{% for post in site.posts %}
5+
{% assign postStartDate = post.date | date: "%s" %}
6+
{% if postStartDate >= curDate %}
7+
{% assign upcoming_events = upcoming_events | push: post %}
8+
{% endif %}
9+
{% endfor %}
10+
{% if upcoming_events.size > 0 %}
11+
{% assign upcoming_event = true %}
12+
{% assign post = upcoming_events | last %}
13+
14+
{% if post.image %}
15+
{% assign image = post.image %}
16+
{% else %}
17+
{% assign image = "static/images/events/default_image_800x800px.jpeg" %}
18+
{% endif %}
19+
{% endif %}
20+
<style>
21+
.upcoming__img-container {
22+
background-image: linear-gradient(to bottom right,
23+
rgba(7, 41, 72, 0.7),
24+
rgba(0, 0, 0, 0.7) 70%,
25+
rgba(0, 0, 0, 0.7) 100%),
26+
url("{{ site.baseurl }}/{{ image }}");
27+
}
28+
</style>

‎_layouts/post.html‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ <h2 class="post__label">Date</h2>
6464
</div>
6565
<div class="row">
6666
<div class="post__button-col col-12">
67-
<a class="post__button btn btn-primary btn-lg text-center" href="{{ page.link }}">
67+
<a class="post__button btn btn-primary btn-lg text-center" href="{{ page.meetup_link }}">
6868
<i class="post__icon fab fa-meetup"></i>
6969
</a>
7070
</div>
@@ -85,18 +85,16 @@ <h1 class="post__content-title">Event's sponsors</h1>
8585

8686
{% for sponsor in page.sponsors %}
8787
{% assign sponsor_obj = site.sponsors | where:"sponsor_id", sponsor | first %}
88-
<div class="row">
88+
<div class="row flex-nowrap">
8989
<div class="post__sponsor-col col-md-12">
9090
<div class="row">
91-
<div class="post__logo-col col-sm-12 col-lg-3">
91+
<div class="post__logo-col col-sm-3 col-12">
9292
<h3 class="post__sponsor-name">{{ sponsor_obj.sponsor_name }}</h3>
93-
<div class="post__sponsor-container">
94-
<a class="post__sponsor-link" href="{{ sponsor_obj.sponsor_link }}">
93+
<a class="post__sponsor-container post__sponsor-link" href="{{ sponsor_obj.sponsor_link }}">
9594
<img class="post__sponsor-img" src="{{ site.baseurl }}/{{ sponsor_obj.sponsor_logo }}">
9695
</a>
97-
</div>
9896
</div >
99-
<div class="col-sm-12 col-lg-9 col-xl-8">
97+
<div class="post__sponsor-info-col col-12 col-sm-auto col-xl-7 ">
10098
<p class="post__sponsor-content">{{ sponsor_obj.content}}</p>
10199
</div>
102100
</div>

‎_posts/2017-10-04-Bokeh-As-A-Backend-For-Pandas.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ link: https://www.meetup.com/Python-Sprints/events/243422372/
99
image: static/images/events/pandas_bokeh_backend_harvey_nash_960x539px.jpeg
1010
sponsors:
1111
- harvey_nash
12+
- bloomberg
13+
- python_software_foundation
14+
- zopa
15+
- touch_surgery
1216
---
1317

1418
According to this recent blog post by [Stack Overflow](https://stackoverflow.com/), Python is declared as the fastest-growing major programming language.

‎_posts/2017-11-01-www.python.org-Part1.md‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,21 @@ sponsors:
1111
- bloomberg
1212
---
1313

14-
We worked on python.org website.
14+
This sprint part of a series (until the features are complete). That's probably 2 or 3 sprints in total. Every event is independent, and you don't need to attend the first part to attend the second (or the other way round).
15+
16+
• Waiting list: Even if you are added to the waiting list, keep an eye the day of the event. There are many people dropping just hours before the event.
17+
18+
The sprint
19+
20+
To communicate during the sprint (also remotely), you can use this gitter [channel](https://gitter.im/py-sprints/python.org)
21+
22+
Around 7pm, it'll be a short hangouts, [you can join in this link](https://plus.google.com/hangouts/_/calendar/bnFjZWkxM2NvZDBhZ3FiNWk2Z2s5Y2kxOWdAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ.49ls39sk27behs8rvnrqtdgs02?authuser=0)
23+
24+
The Python community and the Python Software Foundation are using [http://www.python.org](http://www.python.org) as their main website. Besides general information about Python, the Python installation files, the documentation, the job board and links to other resources, the website includes a section to list all the events of the community, [https://www.python.org/events/](https://www.python.org/events/).
25+
26+
The process to update the content of this section is not optimal, and it is taking too much time from the community (event organizers and python.org moderators mainly).
27+
28+
A new workflow has been proposed to automate some parts and make the process much more efficient. Details can be checked in this ticket:
29+
[https://github.com/python/pythondotorg/issues/1162](https://github.com/python/pythondotorg/issues/1162)
30+
31+
http://www.python.org is built in [Django](http://www.djangoproject.com/).

‎_posts/2017-12-06-python-dateutil.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: post
3-
title: python-dateutil
3+
title: python-dateutil issues
44
project: date-util
55
project_description: Powerful extensions to datetime
66
date: 2017-12-06
@@ -11,4 +11,6 @@ sponsors:
1111
- bloomberg
1212
---
1313

14-
We worked on documentation for python-dateutil.
14+
This time we will be working in [python-dateutil](https://github.com/dateutil/dateutil), one of the most downloaded libraries from PyPI and the de-facto extension for date and times manipulation in Python.
15+
16+
We will have the maintainer of python-dateutil - [Paul Ganssle](https://github.com/pganssle)- helping and reviewing code during the sprint. He will guide us through the [issue tracker](https://github.com/dateutil/dateutil/issues) and organise the work to be carried out along the day.

‎_posts/2018-03-10-Pandas-Documentation-Sprint.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---
2+
layout: post
3+
title: Pandas documentation sprint (worldwide)
4+
project: Pandas
5+
project_description: Powerful Python data analysis toolkit
6+
date: 2018-03-10
7+
venue: Bloomberg (London)
8+
meetup_link: https://www.meetup.com/Python-Sprints/events/247097848/
9+
event_link: https://python-sprints.github.io/pandas/
10+
image: static/images/events/pandas_documentation_sprint_1280_720px.jpg
11+
project_logo: static/images/events/pandas_logo_donation.png
12+
13+
sponsors:
14+
- bloomberg
15+
- python_software_foundation
16+
---
17+
18+
Pandas is an open source Python library for data manipulation and analysis. Its popularity is skyrocketing, and it is becoming the de-facto standard for data science and data engineering. But the number of core developers and contributors did not grow as fast as its popularity, and things like the API documentation would benefit from some help.
19+
20+
This is why we are organizing a worldwide sprint, in which we plan to leave the API documentation for the Series and DataFrame classes in a perfect state.
21+
22+
The sprint will be divided in different chapters. Every chapter has a different website, usually a meetup.com group, where the sprint is coordinated. Find your chapter, and check there the venue, meeting time, etc.
23+
24+
Before the sprint, please make sure:
25+
26+
- Bring your own laptop
27+
- Set up your environment before the sprint
28+
- Make sure you RSVP for your chapter, number of attendees can be limited
29+
- Join the [Gitter channel](https://gitter.im/py-sprints/pandas-doc) of the sprint
30+
31+
## Visit the dedicated website for the event
32+
[https://python-sprints.github.io/pandas/](https://python-sprints.github.io/pandas/)
33+
34+
### Check for availability in other locations
35+
[Other locations worldwide](https://python-sprints.github.io/pandas/#location)

‎_sass/post.scss‎

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@
7373
background: rgba(7, 41, 72, 0.53);
7474
border: #A55605 2px ridge;
7575
}
76+
&:hover > .post__icon {
77+
color: antiquewhite;
78+
}
7679
}
7780

7881
.post__icon {
@@ -102,7 +105,30 @@
102105
padding-right: 10%;
103106
}
104107

105-
.post__logo-col {
108+
@media (min-width: 576px) {
109+
.post__logo-col {
110+
min-width: 160px;
111+
max-width: 160px;
112+
}
113+
}
114+
115+
@media (min-width: 992px) {
116+
.post__logo-col {
117+
min-width: 308px;
118+
max-width: 308px;
119+
}
120+
}
121+
122+
@media (min-width: 576px) {
123+
.post__sponsor-info-col {
124+
width: calc(100% - 160px);
125+
}
126+
}
127+
128+
@media (min-width: 992px) {
129+
.post__sponsor-info-col {
130+
width: calc(100% - 308px);
131+
}
106132
}
107133

108134
.post__paragraph {
@@ -115,29 +141,40 @@
115141
}
116142

117143
.post__sponsor-name {
118-
margin-top: 0.25em;
144+
margin-top: 0.5em;
119145
line-height: 1em;
120146
text-align: center;
121147
font-family: 'Encode Sans Expanded', sans-serif;
122148
font-size: 1.25em;
123149
color: #072948;
124150
}
125151

126-
.post__sponsor-container {
152+
.post__sponsor-link {
153+
display: inline-block;
154+
width: 100%;
127155
background: #041729;
128156
border-radius: 5px;
129157
border: #7fa0c2 1px solid;
130158
text-align: center;
131-
}
132-
133-
.post__sponsor-link {
134-
text-align: center;
135159
line-height: 102px;
136160
}
137161

138162
.post__sponsor-img {
139163
vertical-align: middle;
140164
padding: 10px;
165+
max-width: 220px;
166+
}
167+
168+
@media (min-width: 577px) {
169+
.post__sponsor-img {
170+
max-width: 120px;
171+
}
172+
}
173+
174+
@media (min-width: 992px) {
175+
.post__sponsor-img {
176+
max-width: 100%;
177+
}
141178
}
142179

143180
.post__sponsor-content {

0 commit comments

Comments
 (0)