Skip to content

Commit c5b869a

Browse files
committed
Updated person page, person template, and associated CSS
1 parent b9497ba commit c5b869a

File tree

7 files changed

+68
-88
lines changed

7 files changed

+68
-88
lines changed

_site/about.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,32 +144,32 @@ <h2>Who are we?</h2>
144144
</p>
145145

146146
<h3>Committee</h3>
147-
<div class="row">
148-
<div class="col-2 card text-center">
147+
<div class="row committee-photos">
148+
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
149149
<img class="profile-photo" src="images/drew-profile-photo.png">
150150
<br />
151151
<h4>Drew Morgan</h4>
152152
<smaller>Benevolent Leader</smaller>
153153
</div>
154-
<div class="col-2 card text-center">
154+
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
155155
<img class="profile-photo" src="images/keiran-profile-photo.png">
156156
<br />
157157
<h4>Keiran Wilkinson</h4>
158158
<smaller>Vice Benevolent Leader</smaller>
159159
</div>
160-
<div class="col-2 card text-center">
160+
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
161161
<img class="profile-photo" src="images/jim-profile-photo.png">
162162
<br />
163163
<h4>Jim Evans</h4>
164164
<smaller>Secretary</smaller>
165165
</div>
166-
<div class="col-2 card text-center">
166+
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
167167
<img class="profile-photo" src="images/simon-profile-photo.png">
168168
<br />
169169
<h4>Simon Davey</h4>
170170
<smaller>Equity Officer</smaller>
171171
</div>
172-
<div class="col-2 card text-center">
172+
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
173173
<img class="profile-photo" src="images/sean-profile-photo.png">
174174
<br />
175175
<h4>Sean O'Mahoney</h4>

_site/css/style.css

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,11 @@ iframe {
286286
/* About */
287287
img.profile-photo {
288288
width: 100%;
289+
border-radius: 10px;
290+
}
291+
292+
.committee-photos img.profile-photo {
293+
border-radius: 5px;
289294
}
290295

291296
/* Events */
@@ -361,6 +366,10 @@ div.event-book-button {
361366
.logo-col {
362367
width: 120px;
363368
}
369+
370+
span#small-screen-break {
371+
display: none;
372+
}
364373
}
365374

366375
@media screen and (min-width: 768px) {
@@ -384,8 +393,4 @@ div.event-book-button {
384393
.cover-container {
385394
width: 700px;
386395
}
387-
388-
span#small-screen-break {
389-
display: none;
390-
}
391-
}
396+
}

_site/people-drew.html

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ <h4>Drew Morgan</h4>
99
</div>
1010
<div class="col-md-8 col-lg-7">
1111
<div class="row">
12-
<div class="col-md-4">
12+
<div class="col col-md-6">
1313
<p class="text-muted no-margin">Benevolent Leader, Host, Mentor</p>
1414
</div>
15-
<div class="col-md-8 twitter-mention-container">
15+
<div class="col-md-6 twitter-mention-container text-right">
1616
<a href="https://twitter.com/intent/tweet?screen_name=dangerworm" class="twitter-mention-button"
1717
data-show-count="false">
1818
Tweet to @dangerworm
@@ -23,27 +23,21 @@ <h4>Drew Morgan</h4>
2323
<div class="col-md-12">
2424
<p>
2525
Drew has been coding since he was 7 years old and has worked in the healthcare, education and
26-
finance sectors. Qualified
27-
as a physics teacher in 2011, he taught for four years before returning to software development and
28-
now works
29-
as a full-stack web and applications developer specialising in Microsoft technologies.
26+
finance sectors. Qualified as a physics teacher in 2011, he taught for four years before returning
27+
to software development and now works as a full-stack web and applications developer specialising in
28+
Microsoft technologies.
3029
</p>
3130
<p>
3231
Drew is endlessly curious about science and technology and at university studied Physics for two
33-
years before swapping to
34-
Computer Science with Artificial Intelligence. He plays piano, tuba, guitar and clarinet, regularly
35-
goes
36-
climbing indoors and is a BSAC Dive Leader and assistant SCUBA diving instructor. Drew loves to
37-
share his
38-
experiences and ideas and developed the three-part course “Programming 101” for CodeUp which runs a
39-
few times
40-
a year.
32+
years before swapping to Computer Science with Artificial Intelligence. He plays piano, tuba, guitar
33+
and clarinet, regularly goes climbing indoors and is a BSAC Dive Leader and assistant SCUBA diving
34+
instructor. Drew loves to share his experiences and will talk about anything with anyone.
4135
</p>
4236
</div>
4337
</div>
4438
</div>
4539
<div class="col-md-12 col-lg-2 skills">
46-
<h5>Can help with...</h5>
40+
<h5>Drew can help with...</h5>
4741
<p>
4842
<span class="badge badge-secondary">.Net</span>
4943
<span class="badge badge-secondary">C#</span>
@@ -54,22 +48,18 @@ <h5>Can help with...</h5>
5448
<span class="badge badge-secondary">VB.NET</span>
5549
</p>
5650
<p>
57-
<span class="badge badge-secondary">HTML</span>
5851
<span class="badge badge-secondary">CSS</span>
52+
<span class="badge badge-secondary">HTML</span>
5953
<span class="badge badge-secondary">Javascript</span>
6054
<span class="badge badge-secondary">jQuery</span>
6155
<span class="badge badge-secondary">Razor</span>
56+
<span class="badge badge-secondary">Windows Forms</span>
6257
</p>
6358
<p>
64-
<span class="badge badge-secondary">AJAX</span>
65-
<span class="badge badge-secondary">Entity Framework</span>
66-
<span class="badge badge-secondary">Dapper</span>
6759
<span class="badge badge-secondary">JSON</span>
6860
<span class="badge badge-secondary">MVC</span>
69-
<span class="badge badge-secondary">MVVM</span>
70-
<span class="badge badge-secondary">WPF</span>
61+
<span class="badge badge-secondary">REST</span>
7162
<span class="badge badge-secondary">XAML</span>
72-
<span class="badge badge-secondary">XSLT</span>
7363
</p>
7464
<p>
7565
<span class="badge badge-secondary">Git</span>

_site/people.html

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ <h4>Drew Morgan</h4>
145145
</div>
146146
<div class="col-md-8 col-lg-7">
147147
<div class="row">
148-
<div class="col-md-4">
148+
<div class="col col-md-6">
149149
<p class="text-muted no-margin">Benevolent Leader, Host, Mentor</p>
150150
</div>
151-
<div class="col-md-8 twitter-mention-container">
151+
<div class="col-md-6 twitter-mention-container text-right">
152152
<a href="https://twitter.com/intent/tweet?screen_name=dangerworm" class="twitter-mention-button"
153153
data-show-count="false">
154154
Tweet to @dangerworm
@@ -159,27 +159,21 @@ <h4>Drew Morgan</h4>
159159
<div class="col-md-12">
160160
<p>
161161
Drew has been coding since he was 7 years old and has worked in the healthcare, education and
162-
finance sectors. Qualified
163-
as a physics teacher in 2011, he taught for four years before returning to software development and
164-
now works
165-
as a full-stack web and applications developer specialising in Microsoft technologies.
162+
finance sectors. Qualified as a physics teacher in 2011, he taught for four years before returning
163+
to software development and now works as a full-stack web and applications developer specialising in
164+
Microsoft technologies.
166165
</p>
167166
<p>
168167
Drew is endlessly curious about science and technology and at university studied Physics for two
169-
years before swapping to
170-
Computer Science with Artificial Intelligence. He plays piano, tuba, guitar and clarinet, regularly
171-
goes
172-
climbing indoors and is a BSAC Dive Leader and assistant SCUBA diving instructor. Drew loves to
173-
share his
174-
experiences and ideas and developed the three-part course “Programming 101” for CodeUp which runs a
175-
few times
176-
a year.
168+
years before swapping to Computer Science with Artificial Intelligence. He plays piano, tuba, guitar
169+
and clarinet, regularly goes climbing indoors and is a BSAC Dive Leader and assistant SCUBA diving
170+
instructor. Drew loves to share his experiences and will talk about anything with anyone.
177171
</p>
178172
</div>
179173
</div>
180174
</div>
181175
<div class="col-md-12 col-lg-2 skills">
182-
<h5>Can help with...</h5>
176+
<h5>Drew can help with...</h5>
183177
<p>
184178
<span class="badge badge-secondary">.Net</span>
185179
<span class="badge badge-secondary">C#</span>
@@ -190,22 +184,18 @@ <h5>Can help with...</h5>
190184
<span class="badge badge-secondary">VB.NET</span>
191185
</p>
192186
<p>
193-
<span class="badge badge-secondary">HTML</span>
194187
<span class="badge badge-secondary">CSS</span>
188+
<span class="badge badge-secondary">HTML</span>
195189
<span class="badge badge-secondary">Javascript</span>
196190
<span class="badge badge-secondary">jQuery</span>
197191
<span class="badge badge-secondary">Razor</span>
192+
<span class="badge badge-secondary">Windows Forms</span>
198193
</p>
199194
<p>
200-
<span class="badge badge-secondary">AJAX</span>
201-
<span class="badge badge-secondary">Entity Framework</span>
202-
<span class="badge badge-secondary">Dapper</span>
203195
<span class="badge badge-secondary">JSON</span>
204196
<span class="badge badge-secondary">MVC</span>
205-
<span class="badge badge-secondary">MVVM</span>
206-
<span class="badge badge-secondary">WPF</span>
197+
<span class="badge badge-secondary">REST</span>
207198
<span class="badge badge-secondary">XAML</span>
208-
<span class="badge badge-secondary">XSLT</span>
209199
</p>
210200
<p>
211201
<span class="badge badge-secondary">Git</span>

about.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,32 @@ <h2>Who are we?</h2>
1515
</p>
1616

1717
<h3>Committee</h3>
18-
<div class="row">
19-
<div class="col-2 card text-center">
18+
<div class="row committee-photos">
19+
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
2020
<img class="profile-photo" src="images/drew-profile-photo.png">
2121
<br />
2222
<h4>Drew Morgan</h4>
2323
<smaller>Benevolent Leader</smaller>
2424
</div>
25-
<div class="col-2 card text-center">
25+
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
2626
<img class="profile-photo" src="images/keiran-profile-photo.png">
2727
<br />
2828
<h4>Keiran Wilkinson</h4>
2929
<smaller>Vice Benevolent Leader</smaller>
3030
</div>
31-
<div class="col-2 card text-center">
31+
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
3232
<img class="profile-photo" src="images/jim-profile-photo.png">
3333
<br />
3434
<h4>Jim Evans</h4>
3535
<smaller>Secretary</smaller>
3636
</div>
37-
<div class="col-2 card text-center">
37+
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
3838
<img class="profile-photo" src="images/simon-profile-photo.png">
3939
<br />
4040
<h4>Simon Davey</h4>
4141
<smaller>Equity Officer</smaller>
4242
</div>
43-
<div class="col-2 card text-center">
43+
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
4444
<img class="profile-photo" src="images/sean-profile-photo.png">
4545
<br />
4646
<h4>Sean O'Mahoney</h4>

css/style.css

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,11 @@ iframe {
286286
/* About */
287287
img.profile-photo {
288288
width: 100%;
289+
border-radius: 10px;
290+
}
291+
292+
.committee-photos img.profile-photo {
293+
border-radius: 5px;
289294
}
290295

291296
/* Events */
@@ -361,6 +366,10 @@ div.event-book-button {
361366
.logo-col {
362367
width: 120px;
363368
}
369+
370+
span#small-screen-break {
371+
display: none;
372+
}
364373
}
365374

366375
@media screen and (min-width: 768px) {
@@ -384,8 +393,4 @@ div.event-book-button {
384393
.cover-container {
385394
width: 700px;
386395
}
387-
388-
span#small-screen-break {
389-
display: none;
390-
}
391-
}
396+
}

people-drew.html

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ <h4>Drew Morgan</h4>
99
</div>
1010
<div class="col-md-8 col-lg-7">
1111
<div class="row">
12-
<div class="col-md-4">
12+
<div class="col col-md-6">
1313
<p class="text-muted no-margin">Benevolent Leader, Host, Mentor</p>
1414
</div>
15-
<div class="col-md-8 twitter-mention-container">
15+
<div class="col-md-6 twitter-mention-container text-right">
1616
<a href="https://twitter.com/intent/tweet?screen_name=dangerworm" class="twitter-mention-button"
1717
data-show-count="false">
1818
Tweet to @dangerworm
@@ -23,27 +23,21 @@ <h4>Drew Morgan</h4>
2323
<div class="col-md-12">
2424
<p>
2525
Drew has been coding since he was 7 years old and has worked in the healthcare, education and
26-
finance sectors. Qualified
27-
as a physics teacher in 2011, he taught for four years before returning to software development and
28-
now works
29-
as a full-stack web and applications developer specialising in Microsoft technologies.
26+
finance sectors. Qualified as a physics teacher in 2011, he taught for four years before returning
27+
to software development and now works as a full-stack web and applications developer specialising in
28+
Microsoft technologies.
3029
</p>
3130
<p>
3231
Drew is endlessly curious about science and technology and at university studied Physics for two
33-
years before swapping to
34-
Computer Science with Artificial Intelligence. He plays piano, tuba, guitar and clarinet, regularly
35-
goes
36-
climbing indoors and is a BSAC Dive Leader and assistant SCUBA diving instructor. Drew loves to
37-
share his
38-
experiences and ideas and developed the three-part course “Programming 101” for CodeUp which runs a
39-
few times
40-
a year.
32+
years before swapping to Computer Science with Artificial Intelligence. He plays piano, tuba, guitar
33+
and clarinet, regularly goes climbing indoors and is a BSAC Dive Leader and assistant SCUBA diving
34+
instructor. Drew loves to share his experiences and will talk about anything with anyone.
4135
</p>
4236
</div>
4337
</div>
4438
</div>
4539
<div class="col-md-12 col-lg-2 skills">
46-
<h5>Can help with...</h5>
40+
<h5>Drew can help with...</h5>
4741
<p>
4842
<span class="badge badge-secondary">.Net</span>
4943
<span class="badge badge-secondary">C#</span>
@@ -54,22 +48,18 @@ <h5>Can help with...</h5>
5448
<span class="badge badge-secondary">VB.NET</span>
5549
</p>
5650
<p>
57-
<span class="badge badge-secondary">HTML</span>
5851
<span class="badge badge-secondary">CSS</span>
52+
<span class="badge badge-secondary">HTML</span>
5953
<span class="badge badge-secondary">Javascript</span>
6054
<span class="badge badge-secondary">jQuery</span>
6155
<span class="badge badge-secondary">Razor</span>
56+
<span class="badge badge-secondary">Windows Forms</span>
6257
</p>
6358
<p>
64-
<span class="badge badge-secondary">AJAX</span>
65-
<span class="badge badge-secondary">Entity Framework</span>
66-
<span class="badge badge-secondary">Dapper</span>
6759
<span class="badge badge-secondary">JSON</span>
6860
<span class="badge badge-secondary">MVC</span>
69-
<span class="badge badge-secondary">MVVM</span>
70-
<span class="badge badge-secondary">WPF</span>
61+
<span class="badge badge-secondary">REST</span>
7162
<span class="badge badge-secondary">XAML</span>
72-
<span class="badge badge-secondary">XSLT</span>
7363
</p>
7464
<p>
7565
<span class="badge badge-secondary">Git</span>

0 commit comments

Comments
 (0)