Skip to content

Commit

Permalink
Merge pull request #15 from CardiffMathematicsCodeClub/collapsoblestuff
Browse files Browse the repository at this point in the history
Collapsoblestuff
  • Loading branch information
AdamPohl committed Apr 9, 2015
2 parents 0cd9d32 + 998c8c1 commit 51c6cfa
Show file tree
Hide file tree
Showing 12 changed files with 697 additions and 76 deletions.
3 changes: 1 addition & 2 deletions 404.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@
title: 404 - Page not found
---

<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>

<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>
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ If you are making a draft post and want to preview it locally you can run the fo
$ jekyll serve --w --drafts
```

The draft blog post will appear as the latest post.
The draft blog post will appear as the latest post.


## Contributing

Expand Down
9 changes: 9 additions & 0 deletions _data/contributors.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,38 @@
- name : Adam Pohl
title: Flamboyant Coder
emoji:

- name : Alex Carney
title: Real Coder
emoji:

- name : Ambrose Law
title: Padawan
emoji:

- name : Andy Wilson
title: Background Graphics Manager
emoji:

- name : Batduck
title: gramma correction for the real coder
emoji:

- name : Geraint Palmer
title: The Traitor

- name : Jason Young
title: If there is a problem then it's his fault
emoji:

- name : Tim Standen
title: The code janitor
emoji:

- name : Toby Devlin
title: The drive-by bootstrapper
emoji:

- name : Vince Knight
title: Colonel Sarge
emoji:
103 changes: 51 additions & 52 deletions _data/past_sessions.yml
Original file line number Diff line number Diff line change
@@ -1,54 +1,6 @@
- term: "2014-2015: Spring"
sessions:
- week : 1
name : Three beeps
quote : Doesn't matter Tim will fix it.
author : Everyone (except Jason)

- week : 2
name : The session that was not a session
quote : Don't worry Vince will fix it.
author : Tim 2<sup>nd</sup> Year

- week : 3
name : The one where the Padawan rocked the comand line
quote : Just a little joke to break the ice.
author : Not Anthony (Sam) 1<sup>st</sup> Year

- week : 4
name : Axelrod
quote : Umm Alex... how easy would it be to install Arch on my home computer?
author : Jason PostGrad

- week : 5
name : Text Editor support group
quote : My name is Adam, and I am addicted to editing Atom.
author : Adam 2<sup>nd</sup> Year

- week : 6
name : Introducing Module Planner OS
quote : I will write it in Assembly for the Rasberry Pi
author : Alex 2<sup>nd</sup> Year

- week : 7
name : The time that Jason licked his desk
quote : Is that a 1 or an l
author : Tim 2<sup>nd</sup> Year

- week : 8
name : Fife off!!!
quote : Tim does not know everything sadly, why not try this new thing called the internet.
author : Adam 2<sup>nd</sup> Year

- week : 9
name : The one where Blender came in-to play
quote : WHY IS THIS NOT WORKING?!?
author : Adam 2<sup>nd</sup> Year



- term: "2014-2015: Autumn"
sessions:
- year: "2014-2015"
term1: "Autumn"
sessions1:
- week : 1
name : Real Coders
quote : Only real coders code in Arch
Expand Down Expand Up @@ -102,4 +54,51 @@
- week : 11
name : Risk
quote : 6! You die.
author : Ellie 1<sup>st</sup> Year (Master dice roller)
author : Ellie 1st Year (Master dice roller)

term2: "Spring"
sessions2:
- week : 1
name : Three beeps
quote : Doesn't matter Tim will fix it.
author : Everyone (except Jason)

- week : 2
name : The session that was not a session
quote : Don't worry Vince will fix it.
author : Tim 2<sup>nd</sup> Year

- week : 3
name : The one where the Padawan rocked the comand line
quote : Just a little joke to break the ice.
author : Not Anthony (Sam) 1<sup>st</sup> Year

- week : 4
name : Axelrod
quote : Umm Alex... how easy would it be to install Arch on my home computer?
author : Jason PostGrad

- week : 5
name : Text Editor support group
quote : My name is Adam, and I am addicted to editing Atom.
author : Adam 2<sup>nd</sup> Year

- week : 6
name : Introducing Module Planner OS
quote : I will write it in Assembly for the Rasberry Pi
author : Alex 2<sup>nd</sup> Year

- week : 7
name : The time that Jason licked his desk
quote : Is that a 1 or an l
author : Tim 2<sup>nd</sup> Year

- week : 8
name : Fife off!!!
quote : Tim does not know everything sadly, why not try this new thing called the internet.
author : Adam 2<sup>nd</sup> Year

- week : 9
name : The one where Blender came in-to play
quote : WHY IS THIS NOT WORKING?!?
author : Adam 2<sup>nd</sup> Year
16 changes: 16 additions & 0 deletions _layouts/Sessions.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
layout: default
---
<div class="post">
<div class="main">

<header class="post-header">
<h1>{{ page.title }}</h1>
</header>

<article class="post-content">
{{ content }}
</article>
</div>

</div>
17 changes: 14 additions & 3 deletions css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ body {
background-attachment: fixed;
}

h1, h2, h3, h4, h5, h6 { font-size: 200%; font-weight: 400; }
h1, h2, h3, h4, h5 { font-size: 200%; font-weight: 400; }

h6 {
font-size: 2em;
}

a { color: #2a7ae2; text-decoration: none; }
a:hover { color: #000; text-decoration: underline; }
Expand Down Expand Up @@ -215,13 +219,13 @@ a:visited{
.post-content h2,
.post-content h3,
.post-content h4,
.post-content h5,
.post-content h6 {
.post-content h5{
line-height: 1;
font-weight: 300;
margin: 40px 0 20px;
}


.post-content h2 {
font-size: 32px;
letter-spacing: -1.25px;
Expand All @@ -237,6 +241,13 @@ a:visited{
letter-spacing: -1px;
}

.post-content h6 {
line-height: 1;
font-weight: 1;
font-size: 2em;
letter-spacing: 1px;
}

.post-content blockquote {
border-left: 4px solid #e8e8e8;
padding-left: 20px;
Expand Down
12 changes: 8 additions & 4 deletions css/sessions.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
body{
background-image: url(../res/backround_images/Background-negative.png);
background-color: #000000;
background-image: url(../Graphics/images/Background-negative.png);
color: #4000ff;
}

h1, h2, h3{
color: #f7ff00;
h6{
color:#e2ff00;
}

u{
color: #ff0800;
font-size: 2em;
}

i{
Expand Down
111 changes: 111 additions & 0 deletions css/slicknav.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
/*
Mobile Menu Core Style
*/

.slicknav_btn { position: relative; display: block; vertical-align: center; float: left; line-height: 1em; cursor: pointer; }
.slicknav_menu .slicknav_menutxt { display: block; line-height: 1.188em; float: left; }
.slicknav_menu .slicknav_icon { float: left; margin: 0.188em 0 0 0.438em; }
.slicknav_menu .slicknav_no-text { margin: 0 }
.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); }
.slicknav_btn .slicknav_icon-bar + .slicknav_icon-bar { margin-top: 0.1em }
.slicknav_nav { clear: both }
.slicknav_nav ul,
.slicknav_nav li { display: block }
.slicknav_nav .slicknav_arrow { position: relative; font-size: 10em; margin: 0 0 0 0.4em; float: center; }
.slicknav_nav .slicknav_item { cursor: pointer; }
.slicknav_nav .slicknav_row { display: block; }
.slicknav_nav a { display: block }
.slicknav_nav .slicknav_item a,
.slicknav_nav .slicknav_parent-link a { display: inline }
.slicknav_brand { float:left }
.slicknav_menu:before,
.slicknav_menu:after { content: " "; display: table; }
.slicknav_menu:after { clear: both }

/*
User Default Style
Change the following styles to modify the appearance of the menu.
*/

.slicknav_menu {
box-sizing:border-box;
}
/* Button */
.slicknav_btn {
margin: 1px;
text-decoration:none;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
background-color: #ec4d0b;
}
/* Button Text */
.slicknav_menu .slicknav_menutxt {
color: #FFF;
font-weight: bold;
text-shadow: 0 1px 3px #000;
}
/* Button Lines */
.slicknav_menu .slicknav_icon-bar {
background-color: #f6f5f5;
}
.slicknav_menu {
background:#000000;
padding:5px;
}
.slicknav_nav {
color:#4000ff;
margin:0;
padding:0;
font-size:0.875em;
}
.slicknav_nav, .slicknav_nav ul {
list-style: none;
overflow:hidden;
}
.slicknav_nav ul {
padding:0;
margin:0 0 0 20px;
}
.slicknav_nav .slicknav_row {
padding:5px 10px;
margin:2px 5px;
}
.slicknav_nav a{
padding:5px 10px;
margin:2px 5px;
text-decoration:none;
color:#fff;
}
.slicknav_nav .slicknav_item a,
.slicknav_nav .slicknav_parent-link a {
padding:0;
margin:0;
}
.slicknav_nav .slicknav_row:hover {
-webkit-border-radius: 1px;
-moz-border-radius: 1px;
border-radius: 1px;
background:#ec4d0b;
color:#4000ff;
}
.slicknav_nav a:hover{
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
background:#ff0800;
color:#9e0303;
}

.slicknav_nav .slicknav_txtnode {
margin-left:15px;
}

.slicknav_brand {
color:#4000ff;
font-size: 64px;
line-height:30px;
padding:7px 12px;
height:44px;
}
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</center>
<ul>
{% for contributor in site.data.contributors%}
<li class="contributor"><b>{{contributor.name}}</b> <i>({{contributor.title}})</i></li>
<li class="contributor"><b>{{contributor.name}}</b> <i>({{contributor.title}})</i> {{contributor.emoji}}</li>
{% endfor %}
</ul>
<center>
Expand Down
Loading

0 comments on commit 51c6cfa

Please sign in to comment.