Skip to content

Commit 51c6cfa

Browse files
AdamPohlAdamPohl
committed
Merge pull request #15 from CardiffMathematicsCodeClub/collapsoblestuff
Collapsoblestuff
2 parents 0cd9d32 + 998c8c1 commit 51c6cfa

File tree

12 files changed

+697
-76
lines changed

12 files changed

+697
-76
lines changed

‎404.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@
33
title: 404 - Page not found
44
---
55

6-
<p>The page you have tried to access does not exists. Click <a href="{{ site.baseurl }}/">here</a> to go back to the homepage.</p>
7-
6+
<p>The page you have tried to access does not exist. Click <a href="{{ site.baseurl }}/">here</a> to go back to the homepage.</p>

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ If you are making a draft post and want to preview it locally you can run the fo
2525
$ jekyll serve --w --drafts
2626
```
2727

28-
The draft blog post will appear as the latest post.
28+
The draft blog post will appear as the latest post.
29+
2930

3031
## Contributing
3132

‎_data/contributors.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,38 @@
11
- name : Adam Pohl
22
title: Flamboyant Coder
3+
emoji:
34

45
- name : Alex Carney
56
title: Real Coder
7+
emoji:
68

79
- name : Ambrose Law
810
title: Padawan
11+
emoji:
912

1013
- name : Andy Wilson
1114
title: Background Graphics Manager
15+
emoji:
1216

1317
- name : Batduck
1418
title: gramma correction for the real coder
19+
emoji:
1520

1621
- name : Geraint Palmer
1722
title: The Traitor
1823

1924
- name : Jason Young
2025
title: If there is a problem then it's his fault
26+
emoji:
2127

2228
- name : Tim Standen
2329
title: The code janitor
30+
emoji:
2431

2532
- name : Toby Devlin
2633
title: The drive-by bootstrapper
34+
emoji:
2735

2836
- name : Vince Knight
2937
title: Colonel Sarge
38+
emoji:

‎_data/past_sessions.yml

Lines changed: 51 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,6 @@
1-
- term: "2014-2015: Spring"
2-
sessions:
3-
- week : 1
4-
name : Three beeps
5-
quote : Doesn't matter Tim will fix it.
6-
author : Everyone (except Jason)
7-
8-
- week : 2
9-
name : The session that was not a session
10-
quote : Don't worry Vince will fix it.
11-
author : Tim 2<sup>nd</sup> Year
12-
13-
- week : 3
14-
name : The one where the Padawan rocked the comand line
15-
quote : Just a little joke to break the ice.
16-
author : Not Anthony (Sam) 1<sup>st</sup> Year
17-
18-
- week : 4
19-
name : Axelrod
20-
quote : Umm Alex... how easy would it be to install Arch on my home computer?
21-
author : Jason PostGrad
22-
23-
- week : 5
24-
name : Text Editor support group
25-
quote : My name is Adam, and I am addicted to editing Atom.
26-
author : Adam 2<sup>nd</sup> Year
27-
28-
- week : 6
29-
name : Introducing Module Planner OS
30-
quote : I will write it in Assembly for the Rasberry Pi
31-
author : Alex 2<sup>nd</sup> Year
32-
33-
- week : 7
34-
name : The time that Jason licked his desk
35-
quote : Is that a 1 or an l
36-
author : Tim 2<sup>nd</sup> Year
37-
38-
- week : 8
39-
name : Fife off!!!
40-
quote : Tim does not know everything sadly, why not try this new thing called the internet.
41-
author : Adam 2<sup>nd</sup> Year
42-
43-
- week : 9
44-
name : The one where Blender came in-to play
45-
quote : WHY IS THIS NOT WORKING?!?
46-
author : Adam 2<sup>nd</sup> Year
47-
48-
49-
50-
- term: "2014-2015: Autumn"
51-
sessions:
1+
- year: "2014-2015"
2+
term1: "Autumn"
3+
sessions1:
524
- week : 1
535
name : Real Coders
546
quote : Only real coders code in Arch
@@ -102,4 +54,51 @@
10254
- week : 11
10355
name : Risk
10456
quote : 6! You die.
105-
author : Ellie 1<sup>st</sup> Year (Master dice roller)
57+
author : Ellie 1st Year (Master dice roller)
58+
59+
term2: "Spring"
60+
sessions2:
61+
- week : 1
62+
name : Three beeps
63+
quote : Doesn't matter Tim will fix it.
64+
author : Everyone (except Jason)
65+
66+
- week : 2
67+
name : The session that was not a session
68+
quote : Don't worry Vince will fix it.
69+
author : Tim 2<sup>nd</sup> Year
70+
71+
- week : 3
72+
name : The one where the Padawan rocked the comand line
73+
quote : Just a little joke to break the ice.
74+
author : Not Anthony (Sam) 1<sup>st</sup> Year
75+
76+
- week : 4
77+
name : Axelrod
78+
quote : Umm Alex... how easy would it be to install Arch on my home computer?
79+
author : Jason PostGrad
80+
81+
- week : 5
82+
name : Text Editor support group
83+
quote : My name is Adam, and I am addicted to editing Atom.
84+
author : Adam 2<sup>nd</sup> Year
85+
86+
- week : 6
87+
name : Introducing Module Planner OS
88+
quote : I will write it in Assembly for the Rasberry Pi
89+
author : Alex 2<sup>nd</sup> Year
90+
91+
- week : 7
92+
name : The time that Jason licked his desk
93+
quote : Is that a 1 or an l
94+
author : Tim 2<sup>nd</sup> Year
95+
96+
- week : 8
97+
name : Fife off!!!
98+
quote : Tim does not know everything sadly, why not try this new thing called the internet.
99+
author : Adam 2<sup>nd</sup> Year
100+
101+
- week : 9
102+
name : The one where Blender came in-to play
103+
quote : WHY IS THIS NOT WORKING?!?
104+
author : Adam 2<sup>nd</sup> Year

‎_layouts/Sessions.html

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
layout: default
3+
---
4+
<div class="post">
5+
<div class="main">
6+
7+
<header class="post-header">
8+
<h1>{{ page.title }}</h1>
9+
</header>
10+
11+
<article class="post-content">
12+
{{ content }}
13+
</article>
14+
</div>
15+
16+
</div>

‎css/main.css

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ body {
1818
background-attachment: fixed;
1919
}
2020

21-
h1, h2, h3, h4, h5, h6 { font-size: 200%; font-weight: 400; }
21+
h1, h2, h3, h4, h5 { font-size: 200%; font-weight: 400; }
22+
23+
h6 {
24+
font-size: 2em;
25+
}
2226

2327
a { color: #2a7ae2; text-decoration: none; }
2428
a:hover { color: #000; text-decoration: underline; }
@@ -215,13 +219,13 @@ a:visited{
215219
.post-content h2,
216220
.post-content h3,
217221
.post-content h4,
218-
.post-content h5,
219-
.post-content h6 {
222+
.post-content h5{
220223
line-height: 1;
221224
font-weight: 300;
222225
margin: 40px 0 20px;
223226
}
224227

228+
225229
.post-content h2 {
226230
font-size: 32px;
227231
letter-spacing: -1.25px;
@@ -237,6 +241,13 @@ a:visited{
237241
letter-spacing: -1px;
238242
}
239243

244+
.post-content h6 {
245+
line-height: 1;
246+
font-weight: 1;
247+
font-size: 2em;
248+
letter-spacing: 1px;
249+
}
250+
240251
.post-content blockquote {
241252
border-left: 4px solid #e8e8e8;
242253
padding-left: 20px;

‎css/sessions.css

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
body{
2-
background-image: url(../res/backround_images/Background-negative.png);
3-
background-color: #000000;
2+
background-image: url(../Graphics/images/Background-negative.png);
43
color: #4000ff;
54
}
65

7-
h1, h2, h3{
8-
color: #f7ff00;
6+
h6{
7+
color:#e2ff00;
8+
}
9+
10+
u{
11+
color: #ff0800;
12+
font-size: 2em;
913
}
1014

1115
i{

‎css/slicknav.css

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
/*
2+
Mobile Menu Core Style
3+
*/
4+
5+
.slicknav_btn { position: relative; display: block; vertical-align: center; float: left; line-height: 1em; cursor: pointer; }
6+
.slicknav_menu .slicknav_menutxt { display: block; line-height: 1.188em; float: left; }
7+
.slicknav_menu .slicknav_icon { float: left; margin: 0.188em 0 0 0.438em; }
8+
.slicknav_menu .slicknav_no-text { margin: 0 }
9+
.slicknav_menu .slicknav_icon-bar { display: block; width: 1em; height: 0.125em; -webkit-border-radius: 1px; -moz-border-radius: 1px; border-radius: 1px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); }
10+
.slicknav_btn .slicknav_icon-bar + .slicknav_icon-bar { margin-top: 0.1em }
11+
.slicknav_nav { clear: both }
12+
.slicknav_nav ul,
13+
.slicknav_nav li { display: block }
14+
.slicknav_nav .slicknav_arrow { position: relative; font-size: 10em; margin: 0 0 0 0.4em; float: center; }
15+
.slicknav_nav .slicknav_item { cursor: pointer; }
16+
.slicknav_nav .slicknav_row { display: block; }
17+
.slicknav_nav a { display: block }
18+
.slicknav_nav .slicknav_item a,
19+
.slicknav_nav .slicknav_parent-link a { display: inline }
20+
.slicknav_brand { float:left }
21+
.slicknav_menu:before,
22+
.slicknav_menu:after { content: " "; display: table; }
23+
.slicknav_menu:after { clear: both }
24+
25+
/*
26+
User Default Style
27+
Change the following styles to modify the appearance of the menu.
28+
*/
29+
30+
.slicknav_menu {
31+
box-sizing:border-box;
32+
}
33+
/* Button */
34+
.slicknav_btn {
35+
margin: 1px;
36+
text-decoration:none;
37+
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
38+
-webkit-border-radius: 4px;
39+
-moz-border-radius: 4px;
40+
border-radius: 4px;
41+
background-color: #ec4d0b;
42+
}
43+
/* Button Text */
44+
.slicknav_menu .slicknav_menutxt {
45+
color: #FFF;
46+
font-weight: bold;
47+
text-shadow: 0 1px 3px #000;
48+
}
49+
/* Button Lines */
50+
.slicknav_menu .slicknav_icon-bar {
51+
background-color: #f6f5f5;
52+
}
53+
.slicknav_menu {
54+
background:#000000;
55+
padding:5px;
56+
}
57+
.slicknav_nav {
58+
color:#4000ff;
59+
margin:0;
60+
padding:0;
61+
font-size:0.875em;
62+
}
63+
.slicknav_nav, .slicknav_nav ul {
64+
list-style: none;
65+
overflow:hidden;
66+
}
67+
.slicknav_nav ul {
68+
padding:0;
69+
margin:0 0 0 20px;
70+
}
71+
.slicknav_nav .slicknav_row {
72+
padding:5px 10px;
73+
margin:2px 5px;
74+
}
75+
.slicknav_nav a{
76+
padding:5px 10px;
77+
margin:2px 5px;
78+
text-decoration:none;
79+
color:#fff;
80+
}
81+
.slicknav_nav .slicknav_item a,
82+
.slicknav_nav .slicknav_parent-link a {
83+
padding:0;
84+
margin:0;
85+
}
86+
.slicknav_nav .slicknav_row:hover {
87+
-webkit-border-radius: 1px;
88+
-moz-border-radius: 1px;
89+
border-radius: 1px;
90+
background:#ec4d0b;
91+
color:#4000ff;
92+
}
93+
.slicknav_nav a:hover{
94+
-webkit-border-radius: 6px;
95+
-moz-border-radius: 6px;
96+
border-radius: 6px;
97+
background:#ff0800;
98+
color:#9e0303;
99+
}
100+
101+
.slicknav_nav .slicknav_txtnode {
102+
margin-left:15px;
103+
}
104+
105+
.slicknav_brand {
106+
color:#4000ff;
107+
font-size: 64px;
108+
line-height:30px;
109+
padding:7px 12px;
110+
height:44px;
111+
}

‎index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</center>
3232
<ul>
3333
{% for contributor in site.data.contributors%}
34-
<li class="contributor"><b>{{contributor.name}}</b> <i>({{contributor.title}})</i></li>
34+
<li class="contributor"><b>{{contributor.name}}</b> <i>({{contributor.title}})</i> {{contributor.emoji}}</li>
3535
{% endfor %}
3636
</ul>
3737
<center>

0 commit comments

Comments
 (0)