Skip to content

Commit c75fa23

Browse files
wackytobaccywackytobaccy
committed
cleaned css; modularized layouts; added new pages
- removed css redundancies and unused css - separated head and navbar from layouts - added announcements+practices+posts - added syntax highlighting to config - removed unused js - added some example posts
1 parent a78ed1c commit c75fa23

15 files changed

+624
-334
lines changed

‎_config.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: ACM@UIUC ICPC
22
markdown: redcarpet
3-
highlighter: true
3+
highlighter: pygments
44
baseurl: /icpc-website
5+
paginate: 5

‎_includes/head.html

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<head>
2+
<meta charset="utf-8">
3+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
4+
<title>{{ page.title }}</title>
5+
<meta name="viewport" content="width=device-width">
6+
7+
<!-- brick.im fonts -->
8+
<link rel="stylesheet" href="//brick.a.ssl.fastly.net/Source+Code Pro:400">
9+
10+
<!-- typography fonts -->
11+
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/typo.css">
12+
13+
<!-- font awesome icons -->
14+
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
15+
16+
<!-- syntax highlighting css -->
17+
<link rel="stylesheet" href="{{ site.baseurl }}/css/syntax.css">
18+
19+
<!-- custom css -->
20+
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">
21+
</head>

‎_includes/navbar.html

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<div class="navbar">
2+
<div class="navlist-bg">
3+
<!-- This is temporary until we get a decent logo -->
4+
<div class="brand logo" style="font-size:48px; color:white; margin-left:-48px; margin-top:.25em; margin-bottom:.25em;">
5+
<a href="{{ site.baseurl }}/">λ</a>
6+
<!-- <img width="64px" height="64px" src="./assets/images/64x64_balloon.png"></img> -->
7+
</div>
8+
<div class="navlist">
9+
<div class="item">
10+
<h1 class="brand {% if page.title == 'ICPC'%}active{% endif %}">
11+
<a href="{{ site.baseurl }}/">ICPC</a>
12+
</h1>
13+
</div>
14+
15+
<div class="item {% if page.title == 'Announcements' or page.category == 'announcements' %}active{% endif %}">
16+
<div class="navlink"
17+
style="width:150px;">
18+
<a href="{{ site.baseurl }}/announcements.html">
19+
Announcements
20+
</a>
21+
</div>
22+
</div>
23+
<div class="item {% if page.title == 'Calendar' %}active{% endif %}">
24+
<div class="navlink"
25+
style="width:100px;">
26+
<a href="{{ site.baseurl }}/calendar.html">
27+
Calendar
28+
</a>
29+
</div>
30+
</div>
31+
<div class="item {% if page.title == 'Practices' or page.category == 'practices' %}active{% endif %}">
32+
<div class="navlink"
33+
style="width:100px;">
34+
<a href="{{ site.baseurl }}/practices.html">
35+
Practices
36+
</a>
37+
</div>
38+
</div>
39+
<div class="item {% if page.title == 'Learn' %}active{% endif %}">
40+
<div class="navlink"
41+
style="width:80px;">
42+
<a href="{{ site.baseurl }}/learn.html">
43+
Learn
44+
</a>
45+
</div>
46+
</div>
47+
<div class="item {% if page.title == 'Contact' %}active{% endif %}">
48+
<div class="navlink"
49+
style="width:100px;">
50+
<a href="{{ site.baseurl }}/contact.html">
51+
Contact
52+
</a>
53+
</div>
54+
</div>
55+
56+
<div class="item">
57+
<h1 class="brand right">
58+
<a href="http://www.acm.uiuc.edu/">
59+
ACM@UIUC
60+
</a>
61+
</h1>
62+
</div>
63+
</div>
64+
</div>
65+
</div>

‎_layouts/default.html

+3-91
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,15 @@
11
<!DOCTYPE html>
22
<html>
3-
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6-
<title>{{ page.title }}</title>
7-
<meta name="viewport" content="width=device-width">
8-
9-
<!-- brick.im fonts -->
10-
<link rel="stylesheet" href="//brick.a.ssl.fastly.net/Source+Code Pro:400">
11-
12-
<!-- typography fonts -->
13-
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/typo.css">
14-
15-
<!-- font awesome icons -->
16-
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
17-
18-
<!-- syntax highlighting css -->
19-
<link rel="stylesheet" href="{{ site.baseurl }}/css/syntax.css">
20-
21-
<!-- custom css -->
22-
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">
23-
</head>
3+
{% include head.html %}
244
<body>
25-
<div class="navbar">
26-
<div class="navlist-bg">
27-
<!-- This is temporary until we get a decent logo -->
28-
<div class="brand logo" style="font-size:48px; color:white; margin-left:-48px; margin-top:2px">
29-
<a href="{{ site.baseurl }}/">λ</a>
30-
<!-- <img width="64px" height="64px" src="./assets/images/64x64_balloon.png"></img> -->
31-
</div>
32-
<div class="navlist">
33-
<div class="item">
34-
<h1 class="brand {% if page.title == 'ICPC'%}active{% endif %}">
35-
<a href="{{ site.baseurl }}/">ICPC</a>
36-
</h1>
37-
</div>
38-
39-
<div class="item {% if page.title == 'Announcements' %}active{% endif %}">
40-
<div class="navlink"
41-
style="width:150px;">
42-
<a href="{{ site.baseurl }}/announcements.html">
43-
Announcements
44-
</a>
45-
</div>
46-
</div>
47-
<div class="item {% if page.title == 'Calendar' %}active{% endif %}">
48-
<div class="navlink"
49-
style="width:100px;">
50-
<a href="{{ site.baseurl }}/calendar.html">
51-
Calendar
52-
</a>
53-
</div>
54-
</div>
55-
<div class="item {% if page.title == 'Practice' %}active{% endif %}">
56-
<div class="navlink"
57-
style="width:100px;">
58-
<a href="{{ site.baseurl }}/practice.html">
59-
Practice
60-
</a>
61-
</div>
62-
</div>
63-
<div class="item {% if page.title == 'Learn' %}active{% endif %}">
64-
<div class="navlink"
65-
style="width:80px;">
66-
<a href="{{ site.baseurl }}/learn.html">
67-
Learn
68-
</a>
69-
</div>
70-
</div>
71-
<div class="item {% if page.title == 'Contact' %}active{% endif %}">
72-
<div class="navlink"
73-
style="width:100px;">
74-
<a href="{{ site.baseurl }}/contact.html">
75-
Contact
76-
</a>
77-
</div>
78-
</div>
79-
80-
<div class="item">
81-
<h1 class="brand right">
82-
<a href="http://www.acm.uiuc.edu/">
83-
ACM@UIUC
84-
</a>
85-
</h1>
86-
</div>
87-
</div>
88-
</div>
89-
</div>
5+
{% include navbar.html %}
906

917
{% if page.title == "ICPC" %}
92-
<div class="warbanner"></div>
8+
<div class="warbanner"></div>
939
{% endif %}
9410

9511
<div class="site">
9612
{{ content }}
9713
</div>
9814
</body>
99-
100-
<script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
101-
<script src="//code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
102-
<script type="text/javascript" src="{{ site.baseurl }}/js/main.js"></script>
10315
</html>

‎_layouts/post.html

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
layout: default
3+
---
4+
5+
<div class="post">
6+
<header class="post-header">
7+
{% if page.category == "announcements" %}
8+
<a href="/announcements.html">
9+
<div class="fa fa-comment fa-3x"></div>
10+
</a>
11+
{% else if page.category == "practices" %}
12+
<a href="/practices.html">
13+
<div class="fa fa-code fa-3x"></div>
14+
</a>
15+
{% endif %}
16+
17+
<h1 class="title">{{ page.title }}</h1>
18+
<p class="meta">
19+
{{ page.time }} • {{ page.date | date: "%b %-d, %Y" }}
20+
{% if page.author %} • {{ page.author }}{% endif %}
21+
{% if page.meta %} • {{ page.meta }}{% endif %}
22+
</p>
23+
</header>
24+
25+
<article class="post-content">
26+
{{ content }}
27+
</article>
28+
</div>

‎_layouts/posts.html

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!DOCTYPE html>
2+
<html>
3+
{% include head.html %}
4+
<body>
5+
{% include navbar.html %}
6+
<div class="site">
7+
<div class="resources">
8+
{{ content }}
9+
</div>
10+
</div>
11+
</body>
12+
</html>

‎_posts/2014-12-12-first-announce.md

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
layout: post
3+
category: announcements
4+
time: 1:38 AM
5+
description: test description
6+
---
7+
8+
# Fetibus sociantem nulli
9+
10+
## Lino imagine ingentia notum
11+
12+
Lorem markdownum at tergum delphines et paternos mea adfert, nostro **recubare
13+
auxiliaribus mora** inpluit puer conubia! *Pulsat iaculum vult*. Nam similis
14+
timeam.
15+
16+
{% highlight ruby linenos %}
17+
def show
18+
@widget = Widget(params[:id])
19+
respond_to do |format|
20+
format.html # show.html.erb
21+
format.json { render json: @widget }
22+
end
23+
end
24+
{% endhighlight %}
25+
26+
Fundatis peioris Argolicam plerumque una praestant *solutis* ponunt, quique pro
27+
morata nova: **unus cum rediere** fulvis conciderant. Dolusque mihi: carpit
28+
mercibus et *orbem* redibam; quam quo parente, poterant caret fata dummodo sunt
29+
origo saxo. Pervia fallax sed moles ieiunia, veri non, intra cum dura.
30+
31+
## Adde vetus et Haec eadem Aegides oviumque
32+
33+
Laniarat et aura. Adultera vivere sunt, sed choro
34+
[custodia](http://www.wtfpl.net/) est gradus, si advehor verba ornant. Sceptrum
35+
Cyllenius petitur vulgus illa, sentit protendens carius instat facinusque non,
36+
montanis ut fatis vindicis [lingua numerare veniat](http://landyachtz.com/)? Non
37+
quanto mollirique medias.
38+
39+
- Ut arbor
40+
- Viriles mala novit exemplum erumpit natae exitiabile
41+
- Ecce unda
42+
- Unus agitat
43+
- De omnes

‎_posts/2014-12-12-first-practice.md

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
layout: post
3+
category: practices
4+
time: 1:38 AM
5+
description: test describe
6+
---
7+
8+
# Fetibus sociantem nulli
9+
10+
## Lino imagine ingentia notum
11+
12+
Lorem markdownum at tergum delphines et paternos mea adfert, nostro **recubare
13+
auxiliaribus mora** inpluit puer conubia! *Pulsat iaculum vult*. Nam similis
14+
timeam.
15+
16+
{% highlight ruby linenos %}
17+
def show
18+
@widget = Widget(params[:id])
19+
respond_to do |format|
20+
format.html # show.html.erb
21+
format.json { render json: @widget }
22+
end
23+
end
24+
{% endhighlight %}
25+
26+
Fundatis peioris Argolicam plerumque una praestant *solutis* ponunt, quique pro
27+
morata nova: **unus cum rediere** fulvis conciderant. Dolusque mihi: carpit
28+
mercibus et *orbem* redibam; quam quo parente, poterant caret fata dummodo sunt
29+
origo saxo. Pervia fallax sed moles ieiunia, veri non, intra cum dura.
30+
31+
## Adde vetus et Haec eadem Aegides oviumque
32+
33+
Laniarat et aura. Adultera vivere sunt, sed choro
34+
[custodia](http://www.wtfpl.net/) est gradus, si advehor verba ornant. Sceptrum
35+
Cyllenius petitur vulgus illa, sentit protendens carius instat facinusque non,
36+
montanis ut fatis vindicis [lingua numerare veniat](http://landyachtz.com/)? Non
37+
quanto mollirique medias.
38+
39+
- Ut arbor
40+
- Viriles mala novit exemplum erumpit natae exitiabile
41+
- Ecce unda
42+
- Unus agitat
43+
- De omnes

‎_posts/2014-12-22-2nd-announce.md

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
layout: post
3+
category: announcements
4+
time: 1:38 AM
5+
---
6+
7+
# Fetibus sociantem nulli
8+
9+
## Lino imagine ingentia notum
10+
11+
Lorem markdownum at tergum delphines et paternos mea adfert, nostro **recubare
12+
auxiliaribus mora** inpluit puer conubia! *Pulsat iaculum vult*. Nam similis
13+
timeam.
14+
15+
{% highlight ruby linenos %}
16+
def show
17+
@widget = Widget(params[:id])
18+
respond_to do |format|
19+
format.html # show.html.erb
20+
format.json { render json: @widget }
21+
end
22+
end
23+
{% endhighlight %}
24+
25+
Fundatis peioris Argolicam plerumque una praestant *solutis* ponunt, quique pro
26+
morata nova: **unus cum rediere** fulvis conciderant. Dolusque mihi: carpit
27+
mercibus et *orbem* redibam; quam quo parente, poterant caret fata dummodo sunt
28+
origo saxo. Pervia fallax sed moles ieiunia, veri non, intra cum dura.
29+
30+
## Adde vetus et Haec eadem Aegides oviumque
31+
32+
Laniarat et aura. Adultera vivere sunt, sed choro
33+
[custodia](http://www.wtfpl.net/) est gradus, si advehor verba ornant. Sceptrum
34+
Cyllenius petitur vulgus illa, sentit protendens carius instat facinusque non,
35+
montanis ut fatis vindicis [lingua numerare veniat](http://landyachtz.com/)? Non
36+
quanto mollirique medias.
37+
38+
- Ut arbor
39+
- Viriles mala novit exemplum erumpit natae exitiabile
40+
- Ecce unda
41+
- Unus agitat
42+
- De omnes

0 commit comments

Comments
 (0)