Skip to content

Commit 03dc85c

Browse files
Chapter layout almost complete.
Ready for assessment.
1 parent fc9a715 commit 03dc85c

File tree

10 files changed

+63
-33
lines changed

10 files changed

+63
-33
lines changed

_chapters/london_python_sprints.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ country_code: gb
77
lat: 51.512344
88
lng: -0.090985
99
category: "london"
10+
sponsors:
11+
- harvey_nash
12+
- touch_surgery
13+
- bloomberg
1014
---
1115
We are a London based group of programmers who care about making open source projects better.
1216
We believe in sharing our skills for free to earn our good karma. If you are devoted to a particular open source project, please let us know, we could make a sprint dedicated to it!
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{% comment %}
2-
get_host_sponsor.html (event):
2+
get_sponsor.html (sponsor_id):
33

44
Obtain host sponsor object for the event.
55

66
Get the event's foreign key sponsors and use its first object in the array
77
as host sponsor object.
88

99
Parameters:
10-
event: jekyll post object
11-
Post object containing yml variable sponsors.
10+
sponsor_id: id of the sponsor
11+
Yml variable which will be used to access sponsor object.
1212

1313
Returns:
1414
sponsor: sponsor object
1515
Object from collection sponsors.
1616
{% endcomment %}
1717

18-
{% assign sponsor_id = include.event.sponsor %}
18+
{% assign sponsor_id = include.sponsor_id %}
1919
{% assign sponsor = site.sponsors | where:"obj_id", sponsor_id | first %}
2020

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{% comment %}
2+
<div class="footer__sponsor-col col-md-12 col-lg-6">
3+
<a class="footer__sponsor-link" href="{{ include.item.link }}">
4+
<img class="footer__img"
5+
src="{{ site.baseurl }}/{{ include.item.logo }}"
6+
alt="Sponsor logo">
7+
</a>
8+
</div>
9+
{% endcomment %}
10+
{% assign sponsor = include.sponsor %}
11+
<div class="infobox post__sponsor-box">
12+
<a href="{{ sponsor.link }}">
13+
<img class="post__sponsor-img"
14+
src="{{ site.baseurl }}/{{ sponsor.logo }}"
15+
alt="Sponsor logo">
16+
</a>
17+
<p>More info on <a href="{{ sponsor.link }}">{{ sponsor.name }}</a></p>
18+
<p>{{ sponsor.content }}</p>
19+
</div>

_includes/sponsors_inner_layout.html

Lines changed: 0 additions & 7 deletions
This file was deleted.

_layouts/chapter.html

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,12 @@ <h2 class="chapter__paragraph-title-dark-left">{{ page.title }}</h2>
3636
<p class="chapter__paragraph-dark">
3737
{{ content }}
3838
</p>
39-
<a class="chapter__paragraph-title-dark" href="{{ page.meetup_link }}">
40-
Join us here!
39+
</div>
40+
</div>
41+
<div class="row">
42+
<div class="col-12 text-center">
43+
<a class="btn btn-outline-dark" href="{{ page.meetup_link }}">
44+
Join us!
4145
</a>
4246
</div>
4347
</div>
@@ -83,6 +87,19 @@ <h2 class="chapter__title">Recent Events</h2>
8387
</div>
8488
{% endif %}
8589
</div>
90+
<div class="row no-padding-x">
91+
<div class="col-md-12 no-padding-x">
92+
<h2 class="chapter__title">Our Sponsors</h2>
93+
{% for sponsor_id in page.sponsors %}
94+
{% for sponsor_obj in site.sponsors %}
95+
{% if sponsor_obj.obj_id == sponsor_id %}
96+
{% assign sponsor = sponsor_obj %}
97+
{% include sponsor_inner_layout.html sponsor=sponsor %}
98+
{% endif %}
99+
{% endfor %}
100+
{% endfor %}
101+
</div>
102+
</div>
86103
</div>
87104
</article>
88105
{% include footer.html %}

_layouts/post.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% else %}
66
{% assign image = "static/images/events/default_image_800x800px.jpeg" %}
77
{% endif %}
8-
{% include get_host_sponsor.html event = page %}
8+
{% include get_sponsor.html sponsor_id = page.sponsor %}
99
{% include get_project.html event = page %}
1010
<html lang="en">
1111
<body class="body">

_sass/base.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ $background-dark: #072948;
2626
$page-title: #FAEBD7;
2727
$page-subtitle: #A55605;
2828
$section-title-light: #F0F8FF;
29-
$section-title-dark: #072948;
29+
$section-title-dark: #000000;
3030
$title-light: #FAEBD7;
31-
$title-dark: #072948;
31+
$title-dark: #000000;
3232
$subtitle: #A55605;
3333
$subtitle-event: #035E9A;
3434
$paragraph-dark: #000000;

_sass/chapter.scss

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
}
3333

3434
.chapter__title {
35+
//font-size: 1.65em;
3536
margin-top: 1em;
3637
}
3738

@@ -52,21 +53,23 @@
5253
}
5354

5455
.chapter__paragraph-title-dark {
55-
@extend .title-dark;
56+
//@extend .title-dark;
57+
color: black;
5658
font-size: 1.65em;
57-
text-align: right;
59+
margin-bottom: 2em;
60+
//text-align: right;
5861
}
5962

6063
.chapter__paragraph-title-dark-left {
61-
@extend .title-dark;
62-
font-size: 1.65em;
64+
//@extend .title-dark;
65+
//font-size: 1.65em;
6366
text-align: left;
6467
margin-top: 2em;
6568
}
6669

6770
.chapter__paragraph-title-light {
6871
@extend .title-light;
69-
font-size: 1.65em;
72+
//font-size: 1.65em;
7073
}
7174

7275
.chapter__divider {

_sass/style.scss

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ a {
2424
text-decoration: none !important;
2525
transition: all 0.5s ease-in-out;
2626
&:hover {
27-
color: $link-hover!important;
27+
color: $grey!important;
2828
}
2929
}
3030

@@ -68,14 +68,8 @@ section {
6868
width: 100%;
6969
padding: 10px 5px;
7070
background: $section-background;
71-
border-right: $blue 1px solid;
72-
border-left: $blue 1px solid;
73-
border-top: $blue 1px solid;
74-
border-top-left-radius: 5px;
75-
border-top-right-radius: 5px;
76-
border-bottom: $blue 1px solid;
77-
border-bottom-left-radius: 5px;
78-
border-bottom-right-radius: 5px;
71+
border: 1px solid;
72+
border-radius: 5px;
7973
box-shadow: $black-shadow;
8074
}
8175

@@ -331,7 +325,7 @@ section {
331325
}
332326

333327
.upcoming-chapters-container {
334-
padding-bottom: 10em;
328+
padding-bottom: 5em;
335329
}
336330

337331
#events img {
@@ -343,7 +337,7 @@ section {
343337
margin: 0.25em 0 1em 0;
344338
}
345339

346-
#events .date {
340+
.date {
347341
@extend .title;
348342
color: $blue;
349343
margin-top: 0.5em;

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ <h3 class="text-right">Diversity and inclusion</h3>
178178

179179
<div class="row">
180180
<div class="no-gutters__col col-md-6">
181-
<h3 class="text-left">Contact us</h3>
181+
<h3 class="mt-3 text-left">Contact us</h3>
182182
<hr class="about__divider-left"/>
183183
<form class="container" method="POST" action="//formspree.io/py.sprints@gmail.com" role="form">
184184
<div class="row">

0 commit comments

Comments
 (0)