Skip to content

Commit 0ff2716

Browse files
Tomasz-KluczkowskiTomasz-Kluczkowski
committed
Merge branch 'add_content_to_events_page'
2 parents 3dbf498 + 3ca89ec commit 0ff2716

File tree

12 files changed

+195
-79
lines changed

12 files changed

+195
-79
lines changed

‎_includes/footer.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ <h2 class="footer__section-title">Our Sponsors</h2>
2626
<div class="col-md-3">
2727
<h2 class="footer__section-title">Python Sprints</h2>
2828
<hr class="footer__divider">
29-
<ul class="pl-0 text-center">
29+
<ul class="footer__navigation-list text-center">
3030
<li><a class="footer__link" href="{{ '/' | prepend: site.baseurl }}">Home</a></li>
3131
{% for page in site.pages %}
3232
{% if page.title %}

‎_includes/head.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<head>
22
<meta charset="UTF-8">
33
<meta name="viewport" content="width=device-width, initial-scale=1">
4+
<meta name=”description”
5+
content=”Python Sprints is a non for profit group gathering coders who want to help improve open source projects using Python programming language.”>
46
<script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script>
57
<link href="https://fonts.googleapis.com/css?family=Share+Tech+Mono" rel="stylesheet">
68
<link href="https://fonts.googleapis.com/css?family=Encode+Sans+Expanded" rel="stylesheet">

‎_pages/01_about.html‎

Lines changed: 61 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,64 @@
44
permalink: /about/
55
---
66

7-
<h1>This is the content of the about page</h1>
8-
<h2>Fill it in !!!!</h2>
7+
<section class="about">
8+
<!--REPLACE THIS IMAGE WITH A NEW ONE - MIX PREVIOUS MEETUPS AND MAKE A COLLAGE -->
9+
<div class="about__background-img" data-image-type="responsive">
10+
<picture>
11+
<source srcset="../static/images/events_page/events_page_top_480x150px.jpg 480w,
12+
../static/images/events_page/events_page_top_960x300px.jpg 960w,
13+
../static/images/events_page/events_page_top_1920x600px.jpg 1920w"
14+
media="(orientation: landscape)"
15+
sizes="100vw">
16+
<source srcset="../static/images/events_page/events_page_top_750x650px.jpg 750w,
17+
../static/images/events_page/events_page_top_1650x1100px.jpg 1650w"
18+
media="(orientation: portrait)"
19+
sizes="100vw">
20+
<img class="responsive"
21+
src="../static/images/events_page/events_page_top_960x300px.jpg"
22+
alt="Events"
23+
data-overlay="linear-gradient(180deg, rgba(0, 0, 0, 0.65) 0%, rgba(0, 0, 0, 0.65) 100%)">
24+
</picture>
25+
<div class="about__page-title-container row container-fluid">
26+
<div class="col-sm-12">
27+
<h1 class="about__page-title">About Us</h1>
28+
<h2 class="about__page-subtitle">Our Goals, Our Story</h2>
29+
</div>
30+
</div>
31+
</div>
32+
33+
<div class="about__container container-fluid">
34+
<div class="row">
35+
<div class="col-12">
36+
<h2 class="section-title">Python Sprints Decoded</h2>
37+
<h2 class="about__title">Why We Work Together?</h2>
38+
<p class="about__paragraph-dark">
39+
Python Sprints is a non for profit group of like minded programmers who care about making open source projects better.
40+
We all use them for free but often do not put any thought to how much effort it takes to create and maintain this software. Very often the amount of core developers working on a particular project can be counted on fingers of one hand and yet literally thousands of people use their work.
41+
We believe that we all should share our skills and earn our good karma.
42+
</p>
43+
</div>
44+
</div>
45+
<div class="row">
46+
<div class="col-12">
47+
<h2 class="about__title">How It Started?</h2>
48+
<p class="about__paragraph-dark">
49+
Our group was founded in October 2017. As all things in life the beginnings were humble with only a handful of people collaborating but the word quickly spread and now we have above 500 members and counting.
50+
</p>
51+
</div>
52+
</div>
53+
<div class="row">
54+
<div class="col-12">
55+
<h2 class="about__title">What Our Meetings Look Like?</h2>
56+
<p class="about__paragraph-dark">
57+
Usually there is a subject advertised well ahead of the time with clear setup instructions so that everyone can come prepared.
58+
But you should not worry if setting up is difficult - part of our creed is to help new people get introduced into the world of open source.
59+
Help will be provided even if it is just creating a git repository and learning how to contribute. It is all part of growing our group organically and all people are welcome!
60+
All the coding aside there is always time for joyful banter with pizza and beers to hand.
61+
</p>
62+
</div>
63+
</div>
64+
</div>
65+
66+
67+
</section>

‎_pages/03_events.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
alt="Events"
2121
data-overlay="linear-gradient(180deg, rgba(0, 0, 0, 0.65) 0%, rgba(0, 0, 0, 0.65) 100%)">
2222
</picture>
23-
<div class="row container-fluid">
23+
<div class="events-page__title-container row container-fluid">
2424
<div class="col-sm-12">
2525
<h1 class="events-page__page-title">Events</h1>
26-
<h2 class="events-page__page-subtitle">See what's coming up and what we did recently.</h2>
26+
<h2 class="events-page__page-subtitle">See What's New And What We Did Already</h2>
2727
</div>
2828
</div>
2929
</div>

‎_pages/04_contact.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
alt="Contact Us"
2121
data-overlay="linear-gradient(180deg, rgba(0, 0, 0, 0.75) 0%, rgba(0, 0, 0, 0.75) 100%)">
2222
</picture>
23-
<div class="row container-fluid">
23+
<div class="contact__page-title-container row container-fluid">
2424
<div class="col-sm-12">
2525
<h1 class="contact__page-title">Contact Us</h1>
26-
<h2 class="contact__page-subtitle">Got an idea? Can you or your company support us? Let us know.</h2>
26+
<h2 class="contact__page-subtitle">Got An Idea? Can You Help Us? Let Us Know</h2>
2727
</div>
2828
</div>
2929
</div>

‎_sass/about.scss‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
.about__background-img {
2+
@extend .contact__background-img;
3+
}
4+
5+
.about__page-title-container {
6+
@extend .page__title-container
7+
}
8+
9+
.about__page-title {
10+
@extend .page__title;
11+
}
12+
13+
.about__page-subtitle {
14+
@extend .page__subtitle;
15+
}
16+
17+
.about__container {
18+
max-width: 80%;
19+
}
20+
21+
.about__title {
22+
@extend .title-dark;
23+
margin-top: 5%;
24+
font-size: 1.65em;
25+
}
26+
27+
.about__paragraph-dark {
28+
@extend .paragraph-dark;
29+
padding-left: 0;
30+
padding-right: 0;
31+
}

‎_sass/contact.scss‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,20 @@
22
margin-top: -66px;
33
}
44

5-
@media (orientation: landscape) {
6-
.contact__background-img {
7-
min-height: 55vh;
8-
}
5+
.contact__background-img {
6+
height: 55vh;
97
}
108

11-
@media (orientation: portrait) {
12-
.contact__background-img {
13-
min-height: 25vh;
14-
}
9+
.contact__page-title-container {
10+
@extend .page__title-container;
1511
}
1612

1713
.contact__page-title {
18-
@extend .page-title-light;
14+
@extend .page__title;
1915
}
2016

2117
.contact__page-subtitle {
22-
@extend .page-subtitle;
18+
@extend .page__subtitle;
2319
}
2420

2521
@media (max-width: 576px) {

‎_sass/events.scss‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@
66
@extend .contact__background-img
77
}
88

9+
.events-page__title-container {
10+
@extend .page__title-container;
11+
}
12+
913
.events-page__page-title {
10-
@extend .page-title-light;
14+
@extend .page__title;
1115
}
1216

1317
.events-page__page-subtitle {
14-
@extend .page-subtitle
18+
@extend .page__subtitle
1519
}
1620

1721
.events-page__upcoming-section-title {

‎_sass/style.scss‎

Lines changed: 19 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -115,58 +115,26 @@ a {
115115
background-color: rgba(7, 41, 72, 0.7);
116116
}
117117

118-
.navigation__title, .navigation__subtitle, .navigation__button-close {
119-
user-select: none;
120-
-moz-user-select: none;
121-
-khtml-user-select: none;
122-
-webkit-user-select: none;
123-
-o-user-select: none;
118+
119+
.navigation__title-container {
120+
@extend .page__title-container;
124121
}
125122

126123
.navigation__title {
127-
font-family: 'Share Tech Mono', monospace;
128-
color: $page-title;
129-
font-size: 3.5em;
130-
margin-top: 40vh;
131-
text-align: center;
124+
@extend .page__title;
132125
}
133126

134-
.navigation__subtitle {
135-
font-size: 1.75em;
136-
font-family: 'Share Tech Mono', monospace;
137-
color: $page-subtitle;
138-
text-align: center;
139-
margin-bottom: 50%;
140-
}
141127

142-
@media (min-width: 450px) {
143-
.navigation__title {
144-
font-size: 4.3em;
145-
margin-top: 40vh;
146-
}
147-
.navigation__subtitle {
148-
font-size: 1.9em;
149-
}
150-
}
151-
152-
@media (min-width: 650px) {
153-
.navigation__title {
154-
font-size: 5em;
155-
margin-top: 40vh;
156-
}
157-
.navigation__subtitle {
158-
font-size: 2em;
159-
}
128+
.navigation__subtitle {
129+
@extend .page__subtitle;
160130
}
161131

162-
@media (min-width: 1200px) {
163-
.navigation__title {
164-
font-size: 6em;
165-
margin-top: 40vh;
166-
}
167-
.navigation__subtitle {
168-
font-size: 2.25em;
169-
}
132+
.navigation__button-close {
133+
user-select: none;
134+
-moz-user-select: none;
135+
-khtml-user-select: none;
136+
-webkit-user-select: none;
137+
-o-user-select: none;
170138
}
171139

172140
.navigation__hamburger-bar {
@@ -294,8 +262,8 @@ a {
294262

295263
.upcoming__title {
296264
@extend .section-title;
265+
background-color: rgba(0, 0, 0, 0.5);
297266
width: 100%;
298-
background: rgba(0, 0, 0, 0.9);
299267
font-size: 2.5em;
300268
color: $title-light;
301269
margin-top: 0;
@@ -321,6 +289,7 @@ a {
321289
background: rgba(7, 41, 72, 0.52);
322290
border: $dark-blue 2px groove;
323291
border-radius: 0 5px 5px 5px;
292+
margin-bottom: 1em;
324293
}
325294

326295
.upcoming__img-container {
@@ -633,4 +602,9 @@ a {
633602
width: 30%;
634603
margin-top: 1%;
635604
margin-bottom: 3%;
605+
}
606+
607+
.footer__navigation-list {
608+
list-style-type: none;
609+
padding-left: 0;
636610
}

‎_sass/typography.scss‎

Lines changed: 63 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,69 @@
3333
}
3434

3535
// Text styles below.
36+
// Page title.
37+
38+
.page__title-container {
39+
position: relative;
40+
top: 50%;
41+
-moz-transform: translateY(-50%);
42+
-webkit-transform: translateY(-50%);
43+
-ms-transform: translateY(-50%);
44+
transform: translateY(-50%);
45+
}
46+
47+
48+
.page__title, .page__subtitle {
49+
user-select: none;
50+
-moz-user-select: none;
51+
-khtml-user-select: none;
52+
-webkit-user-select: none;
53+
-o-user-select: none;
54+
}
55+
56+
.page__title {
57+
font-family: 'Share Tech Mono', monospace;
58+
color: $page-title;
59+
font-size: 3.5em;
60+
text-align: center;
61+
}
62+
63+
.page__subtitle {
64+
font-size: 1.75em;
65+
font-family: 'Share Tech Mono', monospace;
66+
color: $page-subtitle;
67+
text-align: center;
68+
}
69+
70+
@media (min-width: 450px) {
71+
.page__title {
72+
font-size: 4.3em;
73+
}
74+
.page__subtitle {
75+
font-size: 1.9em;
76+
}
77+
}
78+
79+
@media (min-width: 650px) {
80+
.page__title {
81+
font-size: 5em;
82+
}
83+
.page__subtitle {
84+
font-size: 2em;
85+
}
86+
}
87+
88+
@media (min-width: 1200px) {
89+
.page__title {
90+
font-size: 6em;
91+
}
92+
.page__subtitle {
93+
font-size: 2.25em;
94+
}
95+
}
96+
97+
// Section titles.
98+
3699

37100
.section-title {
38101
font-size: 2.5em;
@@ -60,20 +123,6 @@
60123
color: $section-title-light;
61124
}
62125

63-
.page-title-light {
64-
@extend .section-title;
65-
margin-top: 20vh;
66-
color: $page-title;
67-
}
68-
69-
.page-subtitle {
70-
font-family: 'Encode Sans Expanded', sans-serif;
71-
color: $subtitle;
72-
font-size: 1.75em;
73-
text-align: center;
74-
margin-bottom: 10vh;
75-
}
76-
77126
.event-label {
78127
font-family: 'Encode Sans Expanded', sans-serif;
79128
background: linear-gradient(45deg, $grey, $grey 80%, transparent 80%, transparent 100%);

0 commit comments

Comments
 (0)