Skip to content

Commit 18e898e

Browse files
author
aeoth
committed
Merge branch 'master' into progress-feed
Conflicts: _site/atom.xml _site/rss.xml
2 parents 6ba2581 + 603fe21 commit 18e898e

File tree

13 files changed

+325
-173
lines changed

13 files changed

+325
-173
lines changed

‎_layouts/layout.html‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,19 @@
1616
<body>
1717
<div id="container">
1818
<div id="side">
19-
<a href="/" id="homelink" title="home" alt="home"><img src="/img/logo.png" alt="Code 52 - a new coding project every week" /></a>
19+
<a href="/" id="home" title="home" alt="home"><img src="/img/logo.png" alt="Code 52 - a new coding project every week" /></a>
20+
<div id="hometext"><a href="/" >code52</a></div>
2021
<div class="section">
21-
<ul>
22-
<li><a href="/about.html">about</a></li>
23-
<li><a href="http://talk.code52.org/">discussion</a></li>
24-
<li><a href="http://twitter.com/code_52">twitter</a></li>
25-
<li><a href="http://jabbr.net/#/rooms/code52">jabbr</a></li>
26-
<li><a href="http://code52.uservoice.com">submit an idea</a></li>
27-
28-
<li><a href="#">past ideas</a></li>
29-
<li><a href="#">wall of champions</a></li>
30-
31-
32-
</ul>
22+
<ul>
23+
<li><a href="/about.html">about</a></li>
24+
<li><a href="http://talk.code52.org/">discussion</a></li>
25+
<li><a href="http://twitter.com/code_52">twitter</a></li>
26+
<li><a href="http://jabbr.net/#/rooms/code52">jabbr</a></li>
27+
<li><a href="http://code52.uservoice.com">uservoice</a></li>
28+
<li><a href="/contributing.html">contributing</a></li>
29+
<li><a href="/projects.html">previous projects</a></li>
30+
</ul>
3331
</div>
34-
3532
</div>
3633
<div id="content">
3734
{{content}}

‎_site/about.html‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,19 @@
1616
<body>
1717
<div id="container">
1818
<div id="side">
19-
<a href="/" id="homelink" title="home" alt="home"><img src="/img/logo.png" alt="Code 52 - a new coding project every week" /></a>
19+
<a href="/" id="home" title="home" alt="home"><img src="/img/logo.png" alt="Code 52 - a new coding project every week" /></a>
20+
<div id="hometext"><a href="/" >code52</a></div>
2021
<div class="section">
21-
<ul>
22-
<li><a href="/about.html">about</a></li>
23-
<li><a href="http://talk.code52.org/">discussion</a></li>
24-
<li><a href="http://twitter.com/code_52">twitter</a></li>
25-
<li><a href="http://jabbr.net/#/rooms/code52">jabbr</a></li>
26-
<li><a href="http://code52.uservoice.com">submit an idea</a></li>
27-
28-
<li><a href="#">past ideas</a></li>
29-
<li><a href="#">wall of champions</a></li>
30-
31-
32-
</ul>
22+
<ul>
23+
<li><a href="/about.html">about</a></li>
24+
<li><a href="http://talk.code52.org/">discussion</a></li>
25+
<li><a href="http://twitter.com/code_52">twitter</a></li>
26+
<li><a href="http://jabbr.net/#/rooms/code52">jabbr</a></li>
27+
<li><a href="http://code52.uservoice.com">uservoice</a></li>
28+
<li><a href="/contributing.html">contributing</a></li>
29+
<li><a href="/projects.html">previous projects</a></li>
30+
</ul>
3331
</div>
34-
3532
</div>
3633
<div id="content">
3734
<div class="entry-container">

‎_site/atom.xml‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,14 @@
33
<title>Code52</title>
44
<link href="http://www.Code52.org/"/>
55
<link type="application/atom+xml" rel="self" href="http://www.Code52.org/atom.xml"/>
6-
<updated>2012-01-07T14:50:08+11:00</updated>
6+
<updated>2012-01-07T15:36:49+11:00</updated>
77
<id>http://www.Code52.org/</id>
88
<author>
99
<name>Code52 Team</name>
1010
<email>Code52@Code52.org</email>
1111
</author>
1212

1313

14-
15-
16-
17-
18-
19-
20-
21-
22-
23-
24-
2514
<entry>
2615
<id>http://www.Code52.org//downmarker</id>
2716
<link type="text/html" rel="alternate" href="http://www.Code52.org//downmarker.html"/>
@@ -53,8 +42,6 @@
5342
</content>
5443
</entry>
5544

56-
57-
5845
<entry>
5946
<id>http://www.Code52.org//introduction</id>
6047
<link type="text/html" rel="alternate" href="http://www.Code52.org//introduction.html"/>
@@ -120,5 +107,4 @@
120107
</content>
121108
</entry>
122109

123-
124110
</feed>

‎_site/contributing.html‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,25 @@
1616
<body>
1717
<div id="container">
1818
<div id="side">
19-
<a href="/" id="homelink" title="home" alt="home"><img src="/img/logo.png" alt="Code 52 - a new coding project every week" /></a>
19+
<a href="/" id="home" title="home" alt="home"><img src="/img/logo.png" alt="Code 52 - a new coding project every week" /></a>
20+
<div id="hometext"><a href="/" >code52</a></div>
2021
<div class="section">
21-
<ul>
22-
<li><a href="/about.html">about</a></li>
23-
<li><a href="http://talk.code52.org/">discussion</a></li>
24-
<li><a href="http://twitter.com/code_52">twitter</a></li>
25-
<li><a href="http://jabbr.net/#/rooms/code52">jabbr</a></li>
26-
<li><a href="http://code52.uservoice.com">submit an idea</a></li>
27-
28-
<li><a href="#">past ideas</a></li>
29-
<li><a href="#">wall of champions</a></li>
30-
31-
32-
</ul>
22+
<ul>
23+
<li><a href="/about.html">about</a></li>
24+
<li><a href="http://talk.code52.org/">discussion</a></li>
25+
<li><a href="http://twitter.com/code_52">twitter</a></li>
26+
<li><a href="http://jabbr.net/#/rooms/code52">jabbr</a></li>
27+
<li><a href="http://code52.uservoice.com">uservoice</a></li>
28+
<li><a href="/contributing.html">contributing</a></li>
29+
<li><a href="/projects.html">previous projects</a></li>
30+
</ul>
3331
</div>
34-
3532
</div>
3633
<div id="content">
3734
<div class="entry-container">
3835
<div class='entry'>
3936
<h1> Contributing to Code52 projects </h1>
40-
<span class="postdate"> 7 January, 2012
37+
<span class="postdate">
4138

4239
</span>
4340
<h2>How do I contribute?</h2>

‎_site/css/style.css‎

Lines changed: 98 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,106 @@
1-
body{ font-family: Segoe UI, sans-serif; margin-left:auto; margin-right: auto; width:1100px; }
2-
h1,h2,h3,h4,h5,h6{ font-family: Segoe UI Light, Segoe WP Light, Segoe UI, Helvetica, sans-serif; font-weight:lighter; margin-bottom:0px; }
3-
h1 { font-size: 3em;}
4-
h2 { font-size: 2.5em;}
5-
a, a:visited { text-decoration: none; color:#13678b;}
6-
a:hover { color:white; background: #13678b}
7-
ul { margin:0; padding:0;}
8-
li { margin:0; padding:0; list-style-type:none;}
9-
10-
.entry ul, .idea ul { margin-left:10px; }
11-
.entry li, .idea li{ margin-left:10px; list-style-type:circle;}
12-
#homelink:hover { background:none; }
13-
#side { float:right;color: #41b1e1; }
14-
#side .section { margin-top:50px; padding:0;}
15-
#side .section ul { font-size:2em; }
16-
#content { width:50%;}
1+
body
2+
{
3+
font-family: Segoe UI, sans-serif;
4+
margin-left:auto;
5+
margin-right: auto;
6+
width:1100px;
7+
}
8+
h1,h2,h3,h4,h5,h6
9+
{
10+
font-family: Segoe UI Light, Segoe WP Light, Segoe UI, Helvetica, sans-serif;
11+
font-weight: lighter;
12+
margin-bottom:0px;
13+
}
14+
h1
15+
{
16+
font-size: 4em;
17+
}
18+
h2
19+
{
20+
font-size: 2.5em;
21+
}
22+
a, a:visited
23+
{
24+
text-decoration: none;
25+
color:#13678b;
26+
}
27+
a:hover
28+
{
29+
color:white;
30+
background: #13678b
31+
}
32+
ul
33+
{
34+
margin:0;
35+
padding:0;
36+
}
37+
li
38+
{
39+
margin:0;
40+
padding:0;
41+
list-style-type:none;
42+
}
43+
.entry ul, .idea ul
44+
{
45+
margin-left:10px;
46+
}
47+
.entry li, .idea li
48+
{
49+
margin-left:10px;
50+
list-style-type:circle;
51+
}
52+
#hometext a { font-size: 2em; margin-left: 5px; margin-right:10px; display: none; color: #41B1E1; font-weight: normal; }
53+
#home:hover
54+
{
55+
background:none;
56+
}
57+
#side
58+
{
59+
float:right;
60+
color: #41b1e1;
61+
margin-left:50px;
62+
}
63+
#side .section
64+
{
65+
margin-top:50px;
66+
margin-bottom: 50px;
67+
padding:0;
68+
}
69+
#side .section ul
70+
{
71+
font-size:2em;
72+
}
73+
#content
74+
{
75+
width:auto;
76+
}
1777
img
1878
{
19-
width: auto !important;
20-
height: auto !important;
21-
max-width: 100%;
79+
width: auto !important;
80+
height: auto !important;
81+
max-width: 100%;
2282
border: none;
2383
}
84+
.postdate
85+
{
86+
font-size: 0.8em;
87+
font-weight: bold;
88+
}
89+
.idea h1, .entry h1
90+
{
91+
margin-bottom: 5px;
92+
}
2493

25-
@media screen and (max-width:750px)
94+
/* min-device-width: 800px instead? */
95+
@media screen and (max-width:900px)
2696
{
2797
body { width:auto; margin:10px; }
2898
#content { width : 100%; }
29-
#side { float:none; width:100%;}
30-
#side ul { font-size:1em; padding:0px; margin:0px; margin-top:20px;}
31-
#side li { display:inline; }
32-
#homelink img { max-width:40%; }
33-
}
34-
35-
.postdate { font-size: 0.8em; font-weight: bold; }
36-
.idea h1, .entry h1 { margin-bottom: 5px;}
99+
#side { float:none; width:100%; margin-left:0px; }
100+
#side .section { margin-top:0; margin-right: 30px; }
101+
#side .section ul { font-size:1.2em; padding:0px; margin:5px; }
102+
#side li { display: inline; margin-left:3px; margin-right: 3px; font-weight: normal; }
103+
#home { display: none; }
104+
#hometext a { display: inline; }
105+
h1 { margin-top: -0px;}
106+
}

‎_site/downmarker.html‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,19 @@
1616
<body>
1717
<div id="container">
1818
<div id="side">
19-
<a href="/" id="homelink" title="home" alt="home"><img src="/img/logo.png" alt="Code 52 - a new coding project every week" /></a>
19+
<a href="/" id="home" title="home" alt="home"><img src="/img/logo.png" alt="Code 52 - a new coding project every week" /></a>
20+
<div id="hometext"><a href="/" >code52</a></div>
2021
<div class="section">
21-
<ul>
22-
<li><a href="/about.html">about</a></li>
23-
<li><a href="http://talk.code52.org/">discussion</a></li>
24-
<li><a href="http://twitter.com/code_52">twitter</a></li>
25-
<li><a href="http://jabbr.net/#/rooms/code52">jabbr</a></li>
26-
<li><a href="http://code52.uservoice.com">submit an idea</a></li>
27-
28-
<li><a href="#">past ideas</a></li>
29-
<li><a href="#">wall of champions</a></li>
30-
31-
32-
</ul>
22+
<ul>
23+
<li><a href="/about.html">about</a></li>
24+
<li><a href="http://talk.code52.org/">discussion</a></li>
25+
<li><a href="http://twitter.com/code_52">twitter</a></li>
26+
<li><a href="http://jabbr.net/#/rooms/code52">jabbr</a></li>
27+
<li><a href="http://code52.uservoice.com">uservoice</a></li>
28+
<li><a href="/contributing.html">contributing</a></li>
29+
<li><a href="/projects.html">previous projects</a></li>
30+
</ul>
3331
</div>
34-
3532
</div>
3633
<div id="content">
3734
<div class="entry-container">

‎_site/index.html‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,19 @@
1616
<body>
1717
<div id="container">
1818
<div id="side">
19-
<a href="/" id="homelink" title="home" alt="home"><img src="/img/logo.png" alt="Code 52 - a new coding project every week" /></a>
19+
<a href="/" id="home" title="home" alt="home"><img src="/img/logo.png" alt="Code 52 - a new coding project every week" /></a>
20+
<div id="hometext"><a href="/" >code52</a></div>
2021
<div class="section">
21-
<ul>
22-
<li><a href="/about.html">about</a></li>
23-
<li><a href="http://talk.code52.org/">discussion</a></li>
24-
<li><a href="http://twitter.com/code_52">twitter</a></li>
25-
<li><a href="http://jabbr.net/#/rooms/code52">jabbr</a></li>
26-
<li><a href="http://code52.uservoice.com">submit an idea</a></li>
27-
28-
<li><a href="#">past ideas</a></li>
29-
<li><a href="#">wall of champions</a></li>
30-
31-
32-
</ul>
22+
<ul>
23+
<li><a href="/about.html">about</a></li>
24+
<li><a href="http://talk.code52.org/">discussion</a></li>
25+
<li><a href="http://twitter.com/code_52">twitter</a></li>
26+
<li><a href="http://jabbr.net/#/rooms/code52">jabbr</a></li>
27+
<li><a href="http://code52.uservoice.com">uservoice</a></li>
28+
<li><a href="/contributing.html">contributing</a></li>
29+
<li><a href="/projects.html">previous projects</a></li>
30+
</ul>
3331
</div>
34-
3532
</div>
3633
<div id="content">
3734
<ul class="ideas">

‎_site/introduction.html‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,19 @@
1616
<body>
1717
<div id="container">
1818
<div id="side">
19-
<a href="/" id="homelink" title="home" alt="home"><img src="/img/logo.png" alt="Code 52 - a new coding project every week" /></a>
19+
<a href="/" id="home" title="home" alt="home"><img src="/img/logo.png" alt="Code 52 - a new coding project every week" /></a>
20+
<div id="hometext"><a href="/" >code52</a></div>
2021
<div class="section">
21-
<ul>
22-
<li><a href="/about.html">about</a></li>
23-
<li><a href="http://talk.code52.org/">discussion</a></li>
24-
<li><a href="http://twitter.com/code_52">twitter</a></li>
25-
<li><a href="http://jabbr.net/#/rooms/code52">jabbr</a></li>
26-
<li><a href="http://code52.uservoice.com">submit an idea</a></li>
27-
28-
<li><a href="#">past ideas</a></li>
29-
<li><a href="#">wall of champions</a></li>
30-
31-
32-
</ul>
22+
<ul>
23+
<li><a href="/about.html">about</a></li>
24+
<li><a href="http://talk.code52.org/">discussion</a></li>
25+
<li><a href="http://twitter.com/code_52">twitter</a></li>
26+
<li><a href="http://jabbr.net/#/rooms/code52">jabbr</a></li>
27+
<li><a href="http://code52.uservoice.com">uservoice</a></li>
28+
<li><a href="/contributing.html">contributing</a></li>
29+
<li><a href="/projects.html">previous projects</a></li>
30+
</ul>
3331
</div>
34-
3532
</div>
3633
<div id="content">
3734
<div class="entry-container">

0 commit comments

Comments
 (0)