Skip to content

Commit 253ebc3

Browse files
author
David Brady
committed
Merge remote-tracking branch 'peterhellberg/master'
2 parents 6605c5a + c956e17 commit 253ebc3

File tree

10 files changed

+194
-39
lines changed

10 files changed

+194
-39
lines changed

‎Gemfile‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
source :rubygems
2+
3+
group :development do
4+
gem "RedCloth", "~> 4.2"
5+
gem "foreman", "~> 0.13"
6+
gem "serve", "~> 1.0"
7+
gem "jekyll", "~> 0.10"
8+
gem "thin", "~> 1.2"
9+
end

‎Gemfile.lock‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
GEM
2+
remote: http://rubygems.org/
3+
specs:
4+
RedCloth (4.2.7)
5+
activesupport (3.0.7)
6+
classifier (1.3.3)
7+
fast-stemmer (>= 1.0.0)
8+
daemons (1.1.3)
9+
directory_watcher (1.4.0)
10+
eventmachine (0.12.10)
11+
fast-stemmer (1.0.0)
12+
foreman (0.13.0)
13+
term-ansicolor (~> 1.0.5)
14+
thor (>= 0.13.6)
15+
i18n (0.4.2)
16+
jekyll (0.10.0)
17+
classifier (>= 1.3.1)
18+
directory_watcher (>= 1.1.1)
19+
liquid (>= 1.9.0)
20+
maruku (>= 0.5.9)
21+
liquid (2.2.2)
22+
maruku (0.6.0)
23+
syntax (>= 1.0.0)
24+
rack (1.2.2)
25+
serve (1.0.0)
26+
activesupport (~> 3.0.1)
27+
i18n (~> 0.4.1)
28+
rack (~> 1.2.1)
29+
tzinfo (~> 0.3.23)
30+
syntax (1.0.0)
31+
term-ansicolor (1.0.5)
32+
thin (1.2.11)
33+
daemons (>= 1.0.9)
34+
eventmachine (>= 0.12.6)
35+
rack (>= 1.0.0)
36+
thor (0.14.6)
37+
tzinfo (0.3.27)
38+
39+
PLATFORMS
40+
ruby
41+
42+
DEPENDENCIES
43+
RedCloth (~> 4.2)
44+
foreman (~> 0.13)
45+
jekyll (~> 0.10)
46+
serve (~> 1.0)
47+
thin (~> 1.2)

‎Procfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
jekyll: bundle exec jekyll --auto
2+
serve: bundle exec serve 4000 development _site

‎_config.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,8 @@ exclude:
55
- CNAME
66
- TODO.textile
77
- script
8+
- Procfile
9+
- Gemfile
10+
- Gemfile.lock
811

912

‎_layouts/chapter.html‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,21 @@
55
<link rel="stylesheet" href="/css/default.css" type="text/css">
66
</head>
77
<body>
8-
<div class="header">
9-
<h1><a href="/">CoffeeScript Cookbook</a></h1>
10-
<a href="/chapters">Chapter Index</a> |
11-
<a href="/contributing">Contributing</a> |
12-
<a href="/authors">Authors</a> |
13-
<a href="/license">License</a>
14-
</div>
15-
16-
<h1>Chapter: {{ page.title }}</h1>
17-
18-
{{ content }}
19-
<hr />
20-
<p>Don't see the recipe you want? Add it yourself by reading the <a href="/contributing">Contributor's Guide</a>, or request it by adding it to <a href="/wanted-recipes">Wanted Recipes</a>.</p>
21-
<p><a href="/license"><img border="0" src="/images/cc_by_badge.png"></a></p>
22-
</body>
8+
<header>
9+
<h1><a href="/">CoffeeScript Cookbook</a></h1>
10+
<a href="/chapters">Chapter Index</a> |
11+
<a href="/contributing">Contributing</a> |
12+
<a href="/authors">Authors</a> |
13+
<a href="/license">License</a>
14+
</header>
15+
<section class="content">
16+
<h2>{{ page.title }}</h2>
17+
{{ content }}
18+
</section>
19+
<footer>
20+
<p>Don't see the recipe you want? Add it yourself by reading the <a href="/contributing">Contributor's Guide</a>, or request it by adding it to <a href="/wanted-recipes">Wanted Recipes</a>.</p>
21+
<a href="/license"><img src="/images/cc_by_badge.png" /></a>
22+
</footer>
23+
</body>
2324
</html>
2425

‎_layouts/default.html‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,20 @@
55
<link rel="stylesheet" href="/css/default.css" type="text/css">
66
</head>
77
<body>
8-
<div class="header">
9-
<h1><a href="/">CoffeeScript Cookbook</a></h1>
10-
<a href="/chapters">Chapter Index</a> |
11-
<a href="/contributing">Contributing</a> |
12-
<a href="/authors">Authors</a> |
13-
<a href="/license">License</a>
14-
</div>
15-
{{ content }}
16-
<hr />
17-
<p>Don't see a recipe you want? See an entire missing chapter? Add it yourself by reading the <a href="/contributing">Contributor's Guide</a>, or request it by adding it to <a href="/wanted-recipes">Wanted Recipes</a>.</p>
18-
<p><a href="/license"><img border="0" src="/images/cc_by_badge.png"></a></p>
19-
</body>
8+
<header>
9+
<h1><a href="/">CoffeeScript Cookbook</a></h1>
10+
<a href="/chapters">Chapter Index</a> |
11+
<a href="/contributing">Contributing</a> |
12+
<a href="/authors">Authors</a> |
13+
<a href="/license">License</a>
14+
</header>
15+
<section class="content">
16+
{{ content }}
17+
</section>
18+
<footer>
19+
<p>Don't see a recipe you want? See an entire missing chapter? Add it yourself by reading the <a href="/contributing">Contributor's Guide</a>, or request it by adding it to <a href="/wanted-recipes">Wanted Recipes</a>.</p>
20+
<a href="/license"><img src="/images/cc_by_badge.png" /></a>
21+
</footer>
22+
</body>
2023
</html>
2124

‎_layouts/recipe.html‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,24 @@
55
<link rel="stylesheet" href="/css/default.css" type="text/css">
66
</head>
77
<body>
8-
<div class="header">
9-
<h2>
10-
<a href="/">CoffeeScript Cookbok:</a>
11-
<a href="/chapters">Chapters</a> &raquo;
12-
<a href="/chapters/{{ page.chapter | downcase }}">{{ page.chapter }}</a> &raquo;
13-
{{ page.title }}</h2>
14-
</div>
15-
{{ content }}
16-
<hr />
17-
<p>Is this recipe wrong, incomplete, or non idiomatic? Help fix it by reading the <a href="/contributing">Contributor's Guide</a>!</p>
18-
<p><a href="/license"><img border="0" src="/images/cc_by_badge.png"></a></p>
8+
<header>
9+
<h1>
10+
<a href="/">CoffeeScript Cookbook</a> &raquo;
11+
<a href="/chapters/{{ page.chapter | downcase }}">{{ page.chapter }}</a> &raquo;
12+
{{ page.title }}
13+
</h1>
14+
<a href="/chapters">Chapter Index</a> |
15+
<a href="/contributing">Contributing</a> |
16+
<a href="/authors">Authors</a> |
17+
<a href="/license">License</a>
18+
</header>
19+
<section class="content">
20+
{{ content }}
21+
</section>
22+
<footer>
23+
<p>Is this recipe wrong, incomplete, or non idiomatic? Help fix it by reading the <a href="/contributing">Contributor's Guide</a>!</p>
24+
<a href="/license"><img src="/images/cc_by_badge.png" /></a>
25+
</footer>
1926
</body>
2027
</html>
2128

‎authors.textile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ _The following people are amazingly rad and awesome because they have helped fix
1919

2020
* David Brady _ratgeyser@gmail.com_
2121
* Mike Moore _mike@blowmage.com_
22+
* Peter Hellberg _peter@c7.se_
2223
* ...You! What are you waiting for? Check out the <a href="/contributing">contributing</a> section and get cracking!
2324

2425

‎chapters/syntax/comparing_ranges.textile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ This is a nice feature lifted from Python. Instead of writing out the full compa
3030
normalHeight = height > maxDwarfism && height < minAcromegaly
3131
{% endhighlight %}
3232

33-
CoffeeScript allows us to chain the two comparisons together in a form that more closely matches the way a mothematician would write it.
33+
CoffeeScript allows us to chain the two comparisons together in a form that more closely matches the way a mathematician would write it.
3434

3535

‎css/default.css‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,85 @@
1+
/* Minimal reset */
2+
3+
* {
4+
vertical-align: baseline;
5+
font-family: inherit;
6+
font-style: inherit;
7+
font-size: 100%;
8+
border: none;
9+
padding: 0;
10+
margin: 0;
11+
}
12+
13+
article, header, section, footer {
14+
display: block;
15+
}
16+
17+
/* Colors */
18+
19+
a, .header a:visited {
20+
color: #26ADE4;
21+
text-decoration: none;
22+
}
23+
24+
a:hover {
25+
text-decoration: underline;
26+
text-shadow: 0 0 0 #DCEEF5;
27+
}
28+
29+
footer {
30+
border-top: 1px solid #eee;
31+
padding-top: 22px;
32+
margin: 21px 0 22px 0;
33+
color: #888;
34+
font-size: 14px;
35+
}
36+
37+
/* Layout (margins, padding) */
38+
39+
pre {
40+
padding: 22px;
41+
line-height: 22px;
42+
margin: 22px 0;
43+
}
44+
45+
p, header, section { margin-bottom: 22px; }
46+
47+
ul {
48+
list-style: none;
49+
}
50+
51+
ul, ol {
52+
margin-left: 22px;
53+
margin-bottom: 22px;
54+
}
55+
56+
/* Typography */
57+
58+
body {
59+
text-rendering: optimizeLegibility;
60+
color: #373837;
61+
font-family: Palatino, "Palatino Linotype", serif;
62+
text-shadow: 0 0 0 transparent;
63+
font-size: 16px;
64+
line-height: 22px;
65+
margin: 22px;
66+
}
67+
68+
pre {
69+
font-family: Monaco, Monospace;
70+
font-size: 14px;
71+
}
72+
73+
h1, h2, h3 {
74+
margin: 0;
75+
padding: 0;
76+
}
77+
78+
h1 { font-size: 30px; line-height: 44px; }
79+
h2 { font-size: 22px; line-height: 44px; }
80+
h3 { font-size: 18px; line-height: 22px; }
81+
82+
/* Syntax Highlighting */
183
.highlight .hll { background-color: #ffffcc }
284
.highlight { background: #f8f8f8; }
385
.highlight .c { color: #408080; font-style: italic } /* Comment */

0 commit comments

Comments
 (0)