Skip to content

Commit fd81f83

Browse files
datapythonistadatapythonista
committed
Updating posts layout, and adding new event
1 parent 2e48ecf commit fd81f83

File tree

13 files changed

+100
-414
lines changed

13 files changed

+100
-414
lines changed

‎_includes/navigation.html‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
</div>
2323
<div class="navigation__overlay">
2424
<div class="navigation__overlay-content">
25-
<a class="navigation__link"
26-
href="{{ '/' | prepend: site.baseurl }}">Home</a>
2725
{% for page in site.pages %}
2826
{% if page.title %}
2927
<a class="navigation__link"
@@ -52,9 +50,6 @@
5250
<div class="collapse navbar-collapse" id="navbarToggler">
5351
<ul class="navbar-nav ml-auto mt-2 mt-lg-0">
5452
{% unless page.is_post or page.is_chapter %}
55-
<li class="nav-item active">
56-
<a class="navigation__link active nav-link" href="#home">Home<span class="sr-only">(current)</span></a>
57-
</li>
5853
<li class="hide-on-desktop nav-item">
5954
<a class="navigation__link nav-link" href="#events">Events</a>
6055
</li>
@@ -70,10 +65,6 @@
7065
<li class="nav-item">
7166
<a class="navigation__link nav-link" href="#contact">Contact</a>
7267
</li>
73-
{% else %}
74-
<li class="nav-item">
75-
<a class="navigation__link nav-link" href="{{ '/' | prepend: site.baseurl }}">Home<span class="sr-only">(current)</span></a>
76-
</li>
7768
{% endunless %}
7869
</ul>
7970
</div>

‎_layouts/post.html‎

Lines changed: 43 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,47 +14,56 @@
1414
<article class="post">
1515
<div class="container-fluid">
1616
<div class="row">
17-
<div class="post__content col-12">
17+
<div class="col-md-9">
18+
<h2>{{ page.title }}</h2>
19+
<div class="infobox post__sponsor-box">
20+
<a href="{{ sponsor.link }}">
21+
<img class="post__sponsor-img"
22+
src="{{ site.baseurl }}/{{ sponsor.logo }}"
23+
alt="Sponsor logo">
24+
</a>
25+
<p>Thanks to <a href="{{ sponsor.link }}">{{ sponsor.name }}</a> for hosting this event!</p>
26+
<p>{{ sponsor.content }}</p>
27+
</div>
28+
<p>{{ page.content }}</p>
29+
30+
<hr/>
31+
1832
{% if project.logo %}
1933
<img class="post__project-logo" src="{{ site.baseurl }}/{{ project.logo }}">
2034
{% endif %}
21-
</div>
22-
</div>
23-
<div class="row">
24-
<div class="post__content col-md-8">
25-
<h1 class="post__content-title">{{ page.title }}</h1>
26-
<h2 class="post__title">Level: {{ page.level }}</h2>
27-
<hr>
28-
<p class="post__paragraph">{{ project.content }}</p>
29-
<p class="post_paragraph">More information about {{ project.name }}: <a href="{{ project.website }}">{{ project.website }}</a></p>
30-
<p class="post__paragraph">{{ page.content }}</p>
31-
<hr>
35+
<p>{{ project.content }}</p>
36+
<p>More information about {{ project.name }}: <a href="{{ project.website }}">{{ project.website }}</a></p>
3237
{% if project.setup_html %}
33-
<h2 class="post__address-title">Set up instructions</h2>
38+
<h3>Set up instructions</h3>
3439
{{ project.setup_html }}
3540
{% endif %}
3641
</div>
37-
<div class="post__info col-md-4">
38-
<h1 class="post__content-title">Location</h1>
39-
<p class="post__address-title">{{ sponsor.name }}</p>
40-
<a class="post__sponsor-container post__sponsor-link" href="{{ host_sponsor.link }}">
41-
<img class="post__sponsor-img"
42-
src="{{ site.baseurl }}/{{ sponsor.logo }}"
43-
alt="Sponsor logo">
44-
</a>
45-
<p class="post__address">{{ page.date | date: "%e %B %Y" }}, {{ page.time }}</p>
46-
<p class="post__address">{{ sponsor.address }}</p>
47-
<div id="chapters__map"></div>
48-
{% comment %}
49-
Create a javascript variable for use in the function adding map markers.
50-
{% endcomment %}
51-
{% assign locations = "" | split: ',' %}
52-
{% assign location = page %}
53-
{% assign locations = locations | push: location %}
54-
{% include locations_variable_generator.html locations_array = locations %}
55-
<script async defer
56-
src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB0NCzoIqGkYFdpRl-LmgWTKpxPBkqxxO0&callback=initMap">
57-
</script>
42+
<div class="col-md-3">
43+
<div class="infobox">
44+
<h3>Information</h3>
45+
<hr/>
46+
<p><b>RSVP:</b> <a href="{{ page.rsvp_link }}">Click here</a></p>
47+
<p><b>Level:</b> {{ page.level }}</p>
48+
<p><b>Date:</b> {{ page.date | date: "%e %B %Y" }}</p>
49+
<p><b>Time:</b> {{ page.time }}</p>
50+
<p>
51+
<b>Address:</b><br/>
52+
{{ sponsor.name }}<br/>
53+
{{ sponsor.address }}
54+
<div id="chapters__map"></div>
55+
{% comment %}
56+
Create a javascript variable for use in the function adding map markers.
57+
{% endcomment %}
58+
{% assign locations = "" | split: ',' %}
59+
{% assign location = page %}
60+
{% assign locations = locations | push: location %}
61+
{% include locations_variable_generator.html locations_array = locations %}
62+
<script async defer
63+
src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB0NCzoIqGkYFdpRl-LmgWTKpxPBkqxxO0&callback=initMap">
64+
</script>
65+
</p>
66+
</div>
5867
</div>
5968
</div>
6069
</div>

‎_posts/2018-04-10-tornado.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
category: london
3+
title: Tornado bugfixing
4+
level: All levels
5+
date: 2018-04-10
6+
time: "18:30"
7+
rsvp_link: https://www.meetup.com/Python-Sprints/events/249304835/
8+
project: tornado
9+
sponsor: touch_surgery
10+
---
11+
12+
In this event, we will have a quick introduction to Tornado, and work
13+
on different bugs, including:
14+
15+
- <https://github.com/tornadoweb/tornado/issues/1122>
16+
- <https://github.com/tornadoweb/tornado/issues/729>
17+
- <https://github.com/tornadoweb/tornado/issues/2140>
18+
19+
Remember to **bring your own laptop**, as usual.
20+
21+
Pizzas and beers will be served during the sprint.

‎_posts/2018-04-22-test-1.md‎

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

‎_posts/2018-04-22-test-1a.md‎

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

‎_posts/2018-05-22-test-2.md‎

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

‎_posts/2018-05-22-test-3.md‎

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

‎_posts/2018-05-22-test-4.md‎

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

‎_sass/events.scss‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
}
4444

4545
.events-page__img-container {
46-
@extend .post__img-container;
4746
border-top-left-radius: 5px;
4847
border-top-right-radius: 5px;
4948
}
@@ -53,7 +52,6 @@
5352
}
5453

5554
.events-page__event-col {
56-
@extend .post__event-col;
5755
border-bottom-left-radius: 5px;
5856
border-bottom-right-radius: 5px;
5957
}
@@ -68,5 +66,4 @@
6866
}
6967

7068
.events-page__button-col {
71-
@extend .post__button-col;
72-
}
69+
}

0 commit comments

Comments
 (0)