Skip to content

Commit 24fd801

Browse files
Tomasz-KluczkowskiTomasz-Kluczkowski
committed
Restructuring about page.
Modified events page to show upcoming only if actually upcoming event present. Added typography paragraph class. Added photo authors to credits.
1 parent 7294872 commit 24fd801

File tree

6 files changed

+134
-69
lines changed

6 files changed

+134
-69
lines changed

‎_pages/01_about.html‎

Lines changed: 26 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -31,69 +31,50 @@ <h2 class="about__page-subtitle">Our Goals, Our Story</h2>
3131

3232
<div class="about__container container-fluid">
3333
<div class="row">
34-
<div class="about__who-container col-12 no-padding-x">
34+
<div class="col-12 no-padding-x">
3535
<h2 class="about__section-title-left">Who We Are</h2>
3636
<div class="row">
3737
<div class="col-md-8 offset-md-2">
38-
<img class="about__paragraph-img-main" src="../static/images/services/advanced_lvl_840x560px.jpg" alt="Test image 1">
39-
<h2 class="about__paragraph-title">Python Sprints Decoded</h2>
38+
<img class="about__paragraph-img-main rounded" src="../static/images/about/python_sprints_decoded_673x411px.JPG" alt="Test image 1">
39+
<h2 class="about__paragraph-title-dark">Python Sprints Decoded</h2>
4040
<hr class="about__divider-right">
4141
<p class="about__paragraph-dark">
4242
Python Sprints is a non for profit group of like minded programmers who care about making open source projects better.
4343
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!
4444
Inclusion is in the nature of our group and we want to make sure that no one is underrepresented. All people are welcome.
4545
</p>
4646
</div>
47-
<div class="col-md-6">
48-
</div>
4947
</div>
5048
</div>
5149
</div>
52-
<div class="row">
53-
<div class="col-md-12">
54-
<h2 class="about__section-title-right">Way To Go</h2>
55-
<h2 class="about__paragraph-title">Passion</h2>
56-
<h2 class="about__paragraph-title">Dedication</h2>
57-
<h2 class="about__paragraph-title">Sharing Knowledge</h2>
50+
</div>
5851

59-
</div>
60-
<div class="about__paragraph-img-container col-md-12">
61-
<img class="about__paragraph-img-top rounded" src="../static/images/services/advanced_lvl_840x560px.jpg" alt="Test image 1">
62-
<img class="about__paragraph-img-bot rounded" src="../static/images/services/advanced_lvl_840x560px.jpg" alt="Test image 1">
52+
53+
54+
55+
<div class="about__img-container col-md-12">
56+
57+
<div class="about__img-top-container">
58+
<div class="about__img-top-title-container">
59+
<h2 class="about__img-top-title">Passion</h2>
6360
</div>
6461
</div>
6562

66-
<!--<div class="row">-->
67-
<!--<div class="col-md-4">-->
68-
<!--<img class="img-fluid" src="../static/images/services/advanced_lvl_840x560px.jpg" alt="Test image 1">-->
69-
<!--</div>-->
70-
<!--<div class="col-md-4">-->
71-
<!--<img class="img-fluid" src="../static/images/services/advanced_lvl_840x560px.jpg" alt="Test image 1">-->
72-
<!--</div>-->
73-
<!--<div class="col-md-4">-->
74-
<!--<img class="img-fluid" src="../static/images/services/advanced_lvl_840x560px.jpg" alt="Test image 1">-->
75-
<!--</div>-->
76-
<!--</div>-->
77-
<!--<div class="row">-->
78-
<!--<div class="col-12">-->
79-
<!--<h2 class="about__title">How It Started?</h2>-->
80-
<!--<p class="about__paragraph-dark">-->
81-
<!--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. Nowadays we meet at least once a month.-->
82-
<!--</p>-->
83-
<!--</div>-->
84-
<!--</div>-->
85-
<!--<div class="row">-->
86-
<!--<div class="col-12">-->
87-
<!--<h2 class="about__title">What Our Meetings Look Like?</h2>-->
88-
<!--<p class="about__paragraph-dark">-->
89-
<!--Usually there is a subject advertised well ahead of the time with clear setup instructions so that everyone can come prepared.-->
90-
<!--You should not worry though if setting up is difficult - part of our creed is to help new people get introduced into the world of open source.-->
91-
<!--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!-->
92-
<!--All the coding aside there is always time for joyful banter with pizza and beers to hand.-->
93-
<!--</p>-->
94-
<!--</div>-->
95-
<!--</div>-->
63+
64+
<div class="about__img-bot-container">
65+
<div class="about__img-bot-title-container">
66+
<h2 class="about__img-bot-title">Dedication</h2>
67+
</div>
68+
<!--<img class="about__img-bot rounded" src="../static/images/about/top_image_964x659px.JPG" alt="Test image 1">-->
69+
</div>
9670
</div>
9771

72+
<div class="about__container container-fluid">
73+
<div class="row">
74+
<div class="col-12 no-padding-x">
75+
<h2 class="about__section-title-left">Our Way</h2>
76+
</div>
77+
</div>
78+
</div>
9879

9980
</section>

‎_pages/03_events.html‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,19 @@ <h2 class="events-page__page-subtitle">Find Out What We Do</h2>
2727
</div>
2828
</div>
2929

30-
<div class="events-page__outer-container container-fluid">
31-
<div class="row">
32-
<div class="col-12">
33-
<h2 class="events-page__upcoming-section-title">Upcoming Events</h2>
34-
{% include events_array_generator.html future_events = true %}
35-
{% for post in posts %}
36-
{% include event_layout.html post = post %}
37-
{% endfor %}
30+
{% include events_array_generator.html future_events = true %}
31+
{% if posts.size > 0 %}
32+
<div class="events-page__outer-container container-fluid">
33+
<div class="row">
34+
<div class="col-12">
35+
<h2 class="events-page__upcoming-section-title">Upcoming Events</h2>
36+
{% for post in posts %}
37+
{% include event_layout.html post = post %}
38+
{% endfor %}
39+
</div>
3840
</div>
3941
</div>
40-
</div>
42+
{% endif %}
4143

4244
<div class="events-page__outer-container container-fluid">
4345
<div class="row">

‎_sass/about.scss‎

Lines changed: 85 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,21 @@
4141
text-align: right;
4242
}
4343

44-
.about__paragraph-title {
44+
45+
.about__title-container {
46+
}
47+
48+
.about__paragraph-title-dark {
4549
@extend .title-dark;
4650
font-size: 1.65em;
4751
text-align: right;
4852
}
4953

54+
.about__paragraph-title-light {
55+
@extend .title-light;
56+
font-size: 1.65em;
57+
}
58+
5059
.about__divider-right {
5160
margin-right: 0;
5261
width: 50%;
@@ -61,36 +70,98 @@
6170
padding-right: 0;
6271
}
6372

73+
.about__paragraph-light {
74+
@extend .paragraph-light;
75+
text-align: justify;
76+
text-justify: inter-word;
77+
padding-left: 0;
78+
padding-right: 0;
79+
}
80+
6481
.about__paragraph-img-main {
6582
width: 35%;
6683
float: left;
6784
margin-right: 1em;
6885
margin-bottom: 0.5em;
6986
}
7087

71-
.about__paragraph-img-container {
88+
.about__img-container {
7289
position: relative;
7390
padding-bottom: 50%;
74-
margin-top: 20%;
91+
margin-top: 10%;
7592
}
7693

77-
78-
.about__paragraph-img-top {
94+
.about__img-top-container {
7995
position: absolute;
80-
display: block;
81-
width: 40%;
8296
top: 0;
8397
right: 15%;
84-
border-bottom: $light-white 2px groove;
85-
border-left: $light-white 2px groove;
98+
background: url("../images/about/top_image_964x643px.JPG") no-repeat top center;
99+
background-size: cover;
100+
overflow: hidden;
101+
width: 40%;
102+
height: 50%;
103+
border: $old-white 2px groove;
104+
border-radius: 5px;
105+
}
106+
107+
.about__img-top-title-container {
108+
position: relative;
109+
top: 0;
110+
left: 0;
111+
z-index: 2;
112+
&::after {
113+
position: absolute;
114+
top: 0;
115+
width: 100%;
116+
height: 100%;
117+
content: "";
118+
display: block;
119+
background: linear-gradient(rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0.3)), url("../images/about/top_image_964x643px.JPG") no-repeat top center;
120+
background-size: cover;
121+
filter: blur(2px);
122+
z-index: -1;
123+
}
86124
}
87125

88-
.about__paragraph-img-bot {
126+
.about__img-top-title {
127+
@extend .about__paragraph-title-light;
128+
text-align: center;
129+
margin-bottom: 0;
130+
line-height: 2em;
131+
}
132+
133+
.about__img-bot-container {
89134
position: absolute;
90-
display: block;
91-
width: 40%;
92135
top: 40%;
93136
left: 15%;
94-
border-top: $light-white 2px groove;
95-
border-right: $light-white 2px groove;
137+
width: 40%;
138+
height: 50%;
139+
background: url("../images/about/top_image_964x659px.JPG") no-repeat top center;
140+
background-size: cover;
141+
overflow: hidden;
142+
border: $old-white 2px groove;
143+
border-radius: 5px;
144+
}
145+
146+
.about__img-bot-title-container {
147+
position: relative;
148+
top: 0;
149+
left: 0;
150+
z-index: 2;
151+
&::after {
152+
position: absolute;
153+
top: 0;
154+
width: 100%;
155+
height: 100%;
156+
content: "";
157+
display: block;
158+
background: linear-gradient(rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0.3)), url("../images/about/top_image_964x659px.JPG") no-repeat top center;
159+
background-size: cover;
160+
filter: blur(2px);
161+
z-index: -1;
162+
}
163+
}
164+
165+
.about__img-bot-title {
166+
@extend .about__img-top-title
96167
}

‎_sass/base.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ $title-dark: #072948;
3131
$subtitle: #A55605;
3232
$subtitle-event: #035E9A;
3333
$paragraph-dark: #000000;
34+
$paragraph-light: #F0F8FF;
3435

3536
$link: #035E9A;
3637
$link-hover: #A55605;

‎_sass/typography.scss‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,14 @@
160160
padding-right: 5%;
161161
}
162162

163+
.paragraph-light {
164+
font-size: 1em;
165+
color: $paragraph-light;
166+
font-family: 'Playfair Display', serif;
167+
padding-left: 5%;
168+
padding-right: 5%;
169+
}
170+
163171
.footer-font {
164172
text-align: center;
165173
font-family: 'Playfair Display', serif;

‎static/credits.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@
1010
contact photo: Photo by Alejandro Escamilla on Unsplash / Photo by NordWood Themes on Unsplash
1111
contact: <a href='https://www.freepik.com/free-photo/blank-business-cards-and-cup-of-coffee-on-wooden-table-corporate-stationary-branding-mock-up_1187395.htm'>Designed by Freepik</a>
1212

13-
events photo: Photo by Alex Kotliarskyi on Unsplash
13+
events photo: Photo by Alex Kotliarskyi on Unsplash
14+
15+
passion photo: Photo by Jefferson Santos on Unsplash

0 commit comments

Comments
 (0)