Skip to content

Commit 085cc05

Browse files
Tomasz-KluczkowskiTomasz-Kluczkowski
committed
Removed unused styles from style.scss.
Changed columns for events and chapters to lg.
1 parent eb1915a commit 085cc05

File tree

4 files changed

+106
-119
lines changed

4 files changed

+106
-119
lines changed

‎_sass/style.scss‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ a {
276276
}
277277

278278
.upcoming-chapters-container {
279-
@include base-background("../images/events/events-chapters_background_480x205px.jpeg");
279+
@include base-background("../images/events/events-chapters_background_480x205px.jpeg");
280280
}
281281

282282
@media (min-width: 481px){
@@ -300,9 +300,6 @@ a {
300300
.upcoming-chapters-container {
301301
background-size: cover;
302302
background-position: center center;
303-
//border-top: rgba(129, 129, 129, 0.51) 1px solid;
304-
305-
//border-top: rgba(7, 41, 72, 0.71) 1px solid;
306303
padding-bottom: 1em;
307304
min-height: 100vh;
308305
}
@@ -313,15 +310,10 @@ a {
313310
}
314311

315312
.upcoming {
316-
//margin-left: 2%;
317-
//margin-right: 2%;
318-
//height: 100vh;
319313
}
320314

321315
@media (min-width: 768px) {
322316
.upcoming {
323-
//margin-left: 10%;
324-
//margin-right: 10%;
325317
}
326318
}
327319

@@ -334,7 +326,7 @@ a {
334326
.upcoming__col {
335327
background: rgba(0, 0, 0, 0.7);
336328
border-radius: 5px;
337-
border: #000000 2px groove;
329+
border: #000000 1px solid;
338330
box-shadow: rgba(0, 0, 0, 0.76) 5px 5px 5px 0;
339331
min-height: 100%;
340332
margin-top: 1em;
@@ -344,26 +336,18 @@ a {
344336
.upcoming__col {
345337
margin-top: 0;
346338
margin-bottom: 0.5em;
347-
//margin-left: auto;
348-
//margin-right: auto;
349339
}
350340
}
351341

352342
.upcoming__title {
353343
@extend .section-title;
354344
background-color: rgba(0, 0, 0, 0.5);
355345
width: 100%;
356-
//font-size: 2.5em;
357346
color: $title-light;
358347
margin-top: 2em;
359348
margin-bottom: 0;
360349
padding-top: 0.5em;
361350
padding-bottom: 0.5em;
362-
//border-top-left-radius: 20px;
363-
//border-top-right-radius: 20px;
364-
//border-bottom: rgba(129, 129, 129, 0.51) 1px solid;
365-
366-
//border-bottom: rgba(250, 235, 215, 0.85) 1px solid;
367351
}
368352
//
369353
//.upcoming__event-label {
@@ -425,6 +409,13 @@ a {
425409
}
426410
}
427411

412+
.upcoming__link-col {
413+
padding-right: 0.5em;
414+
text-align: right;
415+
margin-top: auto;
416+
margin-bottom: 0.5em;
417+
}
418+
428419
.upcoming__link {
429420
}
430421

‎chapter_002_test/_posts/2018-03-20-Pandas-Beginners-Friendly.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
layout: post
3-
title: Pandas, Beginners Friendly
4-
subtitle: Improving Pandas documentation
3+
title: Test event 1
4+
subtitle: Test subtitle 1
55
project: Pandas
66
project_description: Powerful Python data analysis toolkit
77
project_logo: static/images/events/pandas_logo_donation.png
88
project_link: http://pandas.pydata.org/index.html
9-
date: 2018-03-20
9+
date: 2018-04-11
1010
time: "18:30"
11-
venue: Harvey Nash, London
12-
address: 110 Bishopsgate,<br>London,<br>EC2N 4AY
11+
venue: PZM, Szczecin
12+
address: Ul. Pl. Rodla 1,<br>Szczecin,<br>Poland
1313
meetup_link: https://www.meetup.com/Python-Sprints/events/248711552/
1414
event_link:
1515
image:

‎chapter_003_test_1/_posts/2018-03-20-Pandas-Beginners-Friendly.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
layout: post
3-
title: Pandas, Beginners Friendly
4-
subtitle: Improving Pandas documentation
3+
title: Test event 2
4+
subtitle: Test subtitle 2
55
project: Pandas
66
project_description: Powerful Python data analysis toolkit
77
project_logo: static/images/events/pandas_logo_donation.png
88
project_link: http://pandas.pydata.org/index.html
9-
date: 2018-03-20
9+
date: 2018-05-29
1010
time: "18:30"
11-
venue: Harvey Nash, London
12-
address: 110 Bishopsgate,<br>London,<br>EC2N 4AY
11+
venue: SPD, New York
12+
address: 1st Avenue,<br>New York,<br>1SD-DFT3
1313
meetup_link: https://www.meetup.com/Python-Sprints/events/248711552/
1414
event_link:
1515
image:

‎index.html‎

Lines changed: 87 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,12 @@ <h2 class="navigation__subtitle">All About Open Source</h2>
4545

4646
<div class="upcoming-chapters-container container-fluid">
4747
<div class="row">
48-
<div class="col-md-6 no-padding-x">
48+
<div class="col-lg-6 no-padding-x">
4949
<!--Upcoming Events section-->
5050
{% include events_array_generator.html future_events = true %}
5151
{% if posts.size > 0 %}
5252
{% assign upcoming_event = true %}
53+
{% assign posts = posts | reverse %}
5354
{% endif %}
5455
{% if upcoming_event == true %}
5556
<section class="upcoming">
@@ -61,8 +62,6 @@ <h2 class="upcoming__title">Events</h2>
6162
<div class="upcoming__content row with-padding-x">
6263
{% for post in posts %}
6364
<div class="upcoming__col col-md-12 no-padding-x">
64-
65-
6665
<div class="row">
6766
<div class="col-12">
6867
<h2 class="upcoming__event-title"> {{ post.title }}</h2>
@@ -73,9 +72,8 @@ <h2 class="upcoming__event-title"> {{ post.title }}</h2>
7372
<h2 class="upcoming__event-subtitle"> {{ post.subtitle }}</h2>
7473
</div>
7574
</div>
76-
7775
<div class="row">
78-
<div class="col-12">
76+
<div class="col-12 pr-0">
7977
<div class="row">
8078

8179
<div class="col-6 no-padding-x">
@@ -94,15 +92,13 @@ <h2 class="upcoming__event-subtitle"> {{ post.subtitle }}</h2>
9492
</div>
9593
</div>
9694
</div>
97-
98-
<div class="col-6 pr-0 text-right">
95+
<div class="upcoming__link-col col-6">
9996
<a class="upcoming__link" href="{{ post.url }}">
10097
<button class="button-standard btn btn-lg">
10198
Learn More
10299
</button>
103100
</a>
104101
</div>
105-
106102
</div>
107103
</div>
108104
</div>
@@ -119,111 +115,111 @@ <h2 class="upcoming__event-subtitle"> {{ post.subtitle }}</h2>
119115

120116

121117
<!--Use google map api here-->
122-
<div class="col-md-6 no-padding-x">
118+
<div class="col-lg-6 no-padding-x">
123119
<section class="chapters">
124-
<div class="row container-fluid">
125-
<div class="upcoming__img-container col-md-12 no-padding-x">
126-
<div class="row">
127-
<div class="col-12 no-padding-x">
128-
<h2 class="upcoming__title">Chapters</h2>
129-
</div>
120+
<div class="row container-fluid">
121+
<div class="upcoming__img-container col-md-12 no-padding-x">
122+
<div class="row">
123+
<div class="col-12 no-padding-x">
124+
<h2 class="upcoming__title">Chapters</h2>
130125
</div>
131-
<div class="upcoming__content row with-padding-x">
132-
<div class="upcoming__col col-md-5 col-12 mr-auto">
133-
<div class="row">
134-
<div class="no-gutters__col col-6">
135-
<h2 class="upcoming__event-label">Event</h2>
136-
</div>
126+
</div>
127+
<div class="upcoming__content row with-padding-x">
128+
<div class="upcoming__col col-md-5 col-12 mr-auto">
129+
<div class="row">
130+
<div class="no-gutters__col col-6">
131+
<h2 class="upcoming__event-label">Event</h2>
137132
</div>
138-
<div class="row">
139-
<div class="upcoming__event-title col-12">
140-
{{ post.title }}
141-
</div>
133+
</div>
134+
<div class="row">
135+
<div class="upcoming__event-title col-12">
136+
{{ post.title }}
142137
</div>
143-
<div class="row">
144-
<div class="no-gutters__col col-6">
145-
<h2 class="upcoming__event-label">Venue</h2>
146-
</div>
138+
</div>
139+
<div class="row">
140+
<div class="no-gutters__col col-6">
141+
<h2 class="upcoming__event-label">Venue</h2>
147142
</div>
148-
<div class="row">
149-
<div class="upcoming__event-title col-12">
150-
{{ post.venue }}
151-
</div>
143+
</div>
144+
<div class="row">
145+
<div class="upcoming__event-title col-12">
146+
{{ post.venue }}
152147
</div>
148+
</div>
149+
<div class="row">
150+
<div class="no-gutters__col col-6">
151+
<h2 class="upcoming__event-label">Date</h2>
152+
</div>
153+
</div>
154+
<div class="row">
155+
<div class="upcoming__event-title col-12">
156+
{{ post.date | date: "%e %B %Y" }}
157+
</div>
158+
</div>
159+
{% if post.project_logo %}
153160
<div class="row">
154161
<div class="no-gutters__col col-6">
155-
<h2 class="upcoming__event-label">Date</h2>
162+
<h2 class="upcoming__event-label">Project</h2>
156163
</div>
157164
</div>
158165
<div class="row">
159-
<div class="upcoming__event-title col-12">
160-
{{ post.date | date: "%e %B %Y" }}
166+
<div class="upcoming__event-title col-12 text-center">
167+
<a href="{{ post.project_link }}">
168+
<img class="upcoming__project-logo"
169+
src="{{ site.baseurl }}/{{ post.project_logo }}"
170+
alt="Upcoming project logo">
171+
</a>
161172
</div>
162173
</div>
163-
{% if post.project_logo %}
164-
<div class="row">
165-
<div class="no-gutters__col col-6">
166-
<h2 class="upcoming__event-label">Project</h2>
167-
</div>
168-
</div>
169-
<div class="row">
170-
<div class="upcoming__event-title col-12 text-center">
171-
<a href="{{ post.project_link }}">
172-
<img class="upcoming__project-logo"
173-
src="{{ site.baseurl }}/{{ post.project_logo }}"
174-
alt="Upcoming project logo">
175-
</a>
176-
</div>
177-
</div>
178-
{% endif %}
179-
</div>
180-
<div class="upcoming__col col-md-5 text-center">
174+
{% endif %}
175+
</div>
176+
<div class="upcoming__col col-md-5 text-center">
181177

182-
<div class="row">
183-
<div class="no-gutters__col col-6">
184-
<h2 class="upcoming__event-label">Sponsors</h2>
185-
</div>
178+
<div class="row">
179+
<div class="no-gutters__col col-6">
180+
<h2 class="upcoming__event-label">Sponsors</h2>
186181
</div>
187-
<div class="row">
188-
<div class="upcoming__sponsor-col col-12">
189-
{% assign site_sponsors_all = "" | split: ',' %}
190-
{% for sponsor in site.sponsors %}
191-
{% assign site_sponsors_all = site_sponsors_all | push: sponsor %}
192-
{% endfor %}
193-
<!--Build an array of sponsors for the event.-->
194-
{% assign event_sponsors = "" | split: ',' %}
195-
{% for sponsor in post.sponsors %}
196-
{% for site_sponsor in site_sponsors_all %}
197-
{% if site_sponsor.sponsor_id == sponsor %}
198-
{% assign event_sponsors = event_sponsors | push: site_sponsor %}
199-
{% endif %}
200-
{% endfor %}
182+
</div>
183+
<div class="row">
184+
<div class="upcoming__sponsor-col col-12">
185+
{% assign site_sponsors_all = "" | split: ',' %}
186+
{% for sponsor in site.sponsors %}
187+
{% assign site_sponsors_all = site_sponsors_all | push: sponsor %}
188+
{% endfor %}
189+
<!--Build an array of sponsors for the event.-->
190+
{% assign event_sponsors = "" | split: ',' %}
191+
{% for sponsor in post.sponsors %}
192+
{% for site_sponsor in site_sponsors_all %}
193+
{% if site_sponsor.sponsor_id == sponsor %}
194+
{% assign event_sponsors = event_sponsors | push: site_sponsor %}
195+
{% endif %}
201196
{% endfor %}
202-
{%
203-
include row_display_outer_loop.html
204-
items_array = event_sponsors
205-
inner_layout = "sponsors_inner_layout.html"
206-
%}
207-
</div>
197+
{% endfor %}
198+
{%
199+
include row_display_outer_loop.html
200+
items_array = event_sponsors
201+
inner_layout = "sponsors_inner_layout.html"
202+
%}
208203
</div>
209204
</div>
210205
</div>
211-
<div class="upcoming__button-row row">
212-
<div class="col-md-12 text-center">
213-
{% if post.event_link %}
214-
{% assign upcoming_event_link = post.event_link %}
215-
{% else %}
216-
{% assign upcoming_event_link = post.meetup_link %}
217-
{% endif %}
218-
<a class="upcoming__link" href="{{ upcoming_event_link }}">
219-
<button class="button-standard btn btn-lg">
220-
Learn More
221-
</button>
222-
</a>
223-
</div>
206+
</div>
207+
<div class="upcoming__button-row row">
208+
<div class="col-md-12 text-center">
209+
{% if post.event_link %}
210+
{% assign upcoming_event_link = post.event_link %}
211+
{% else %}
212+
{% assign upcoming_event_link = post.meetup_link %}
213+
{% endif %}
214+
<a class="upcoming__link" href="{{ upcoming_event_link }}">
215+
<button class="button-standard btn btn-lg">
216+
Learn More
217+
</button>
218+
</a>
224219
</div>
225220
</div>
226221
</div>
222+
</div>
227223
</section>
228224
</div>
229225
</div>

0 commit comments

Comments
 (0)