Skip to content

Commit d35d517

Browse files
author
tristen
committed
Overhaul of stuff to reflect some of the new changes in Jekyll and configuration options in prose
1 parent f712d17 commit d35d517

17 files changed

+218
-23
lines changed

‎CNAME

Whitespace-only changes.

‎_config.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
auto: true
2-
server: true
3-
baseurl:
4-
permalink: /:title
1+
baseurl: /starter
2+
permalink: pretty
3+
markdown: rdiscount

‎_includes/rss-item.xml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<item>
2+
<title>{{item.title | xml_escape}}</title>
3+
<link>http://mapbox.com{{item.url}}</link>
4+
<description>{{item.content | markdownify | xml_escape}}</description>
5+
<pubDate>{{item.date | date_to_xmlschema}}</pubDate>
6+
<dc:creator>SITE NAME</dc:creator>
7+
<guid isPermaLink="true">{{site.baseurl}}{{item.url}}</guid>
8+
</item>

‎_includes/rss-link.html

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<div class='col4 margin3 pad4'>
2+
<a class='rss' href='{{site.baseurl}}/blog.rss'>Subscribe via RSS</a>
3+
</div>

‎_layouts/blog.html

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
layout: default
3+
section: blog
4+
---
5+
6+
{% if page.splash %}
7+
{% if page.splash contains 'http' %}
8+
{% capture url %}{{page.splash}}{% endcapture %}
9+
{% else %}
10+
{% capture url %}{{site.baseurl}}{{page.splash}}/{% endcapture %}
11+
{% endif %}
12+
13+
<div class='col12 splash'>
14+
<img src='{{url}}' alt='' />
15+
</div>
16+
{% endif %}
17+
18+
<div class='listing col6 pad4h margin3'>
19+
<div class='heading'>
20+
<h1>{{page.title}}</h1><span class='date'>{{page.date | date:"%b %d"}}</span>
21+
</div>
22+
23+
<div class='prose'>
24+
{{content}}
25+
</div>
26+
</div>
27+
28+
{% include rss-link.html %}

‎_layouts/default.html

+12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
title: 'This is my Blog Name'
23
---
34
<!DOCTYPE html>
45
<html>
@@ -11,6 +12,17 @@
1112
</head>
1213
<body>
1314
<div class='container'>
15+
<div class='col12 clearfix'>
16+
<div class='header col6 margin3 pad4h'>
17+
<div class='clearfix col12'>
18+
<div class='menu fr'>
19+
<a class='{% if page.section == "blog" %}active{% endif %}' href='{{site.baseurl}}/'>Blog</a>
20+
<a class='{% if page.url == "about/" %}active{% endif %}' href='{{site.baseurl}}/about'>About</a>
21+
</div>
22+
<h1 class='title'><a href='{{site.baseurl}}/'>{{page.title}}</a></h1>
23+
</div>
24+
</div>
25+
</div>
1426
{{content}}
1527
</div>
1628
<script src='{{site.baseurl}}/site.js'></script>

‎_layouts/page.html

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
layout: default
3+
---
4+
5+
<div class='listing col6 pad4h margin3'>
6+
<h2>{{page.title}}</h2>
7+
<div class='prose'>
8+
{{content}}
9+
</div>
10+
</div>

‎_posts/0100-01-01-hello-world.html

-5
This file was deleted.

‎_posts/2013-05-09-hello-world.html

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
layout: blog
3+
category: blog
4+
splash: 'http://placehold.it/1600x500'
5+
---
6+
7+
Proin at eros non eros adipiscing mollis. Donec semper turpis sed diam. Sed consequat ligula nec tortor. Integer eget sem. Ut vitae enim eu est vehicula gravida. Morbi ipsum ipsum, porta nec, tempor id, auctor vitae, purus. Pellentesque neque. Nulla luctus erat vitae libero. Integer nec enim. Phasellus aliquam enim et tortor. Quisque aliquet, quam elementum condimentum feugiat, tellus odio consectetuer wisi, vel nonummy sem neque in elit. Curabitur eleifend wisi iaculis ipsum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In non velit non ligula laoreet ultrices. Praesent ultricies facilisis nisl. Vivamus luctus elit sit amet mi. Phasellus pellentesque, erat eget elementum volutpat, dolor nisl porta neque, vitae sodales ipsum nibh in ligula. Maecenas mattis pulvinar diam. Curabitur sed leo.

‎_posts/2013-06-10-another-post.html

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
layout: blog
3+
category: blog
4+
splash: 'http://placehold.it/1600x500'
5+
---
6+
7+
Proin at eros non eros adipiscing mollis. Donec semper turpis sed diam. Sed consequat ligula nec tortor. Integer eget sem. Ut vitae enim eu est vehicula gravida. Morbi ipsum ipsum, porta nec, tempor id, auctor vitae, purus. Pellentesque neque. Nulla luctus erat vitae libero. Integer nec enim. Phasellus aliquam enim et tortor. Quisque aliquet, quam elementum condimentum feugiat, tellus odio consectetuer wisi, vel nonummy sem neque in elit. Curabitur eleifend wisi iaculis ipsum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In non velit non ligula laoreet ultrices. Praesent ultricies facilisis nisl. Vivamus luctus elit sit amet mi. Phasellus pellentesque, erat eget elementum volutpat, dolor nisl porta neque, vitae sodales ipsum nibh in ligula. Maecenas mattis pulvinar diam. Curabitur sed leo.

‎_posts/2013-06-16-hello-again.html

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
layout: blog
3+
category: blog
4+
splash: 'http://placehold.it/1600x500'
5+
---
6+
7+
Proin at eros non eros adipiscing mollis. Donec semper turpis sed diam. Sed consequat ligula nec tortor. Integer eget sem. Ut vitae enim eu est vehicula gravida. Morbi ipsum ipsum, porta nec, tempor id, auctor vitae, purus. Pellentesque neque. Nulla luctus erat vitae libero. Integer nec enim. Phasellus aliquam enim et tortor. Quisque aliquet, quam elementum condimentum feugiat, tellus odio consectetuer wisi, vel nonummy sem neque in elit. Curabitur eleifend wisi iaculis ipsum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In non velit non ligula laoreet ultrices. Praesent ultricies facilisis nisl. Vivamus luctus elit sit amet mi. Phasellus pellentesque, erat eget elementum volutpat, dolor nisl porta neque, vitae sodales ipsum nibh in ligula. Maecenas mattis pulvinar diam. Curabitur sed leo.

‎_posts/static/0100-01-01-about.html

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
layout: page
3+
permalink: about/
4+
---
5+
6+
Proin at eros non eros adipiscing mollis. Donec semper turpis sed diam. Sed consequat ligula nec tortor. Integer eget sem. Ut vitae enim eu est vehicula gravida. Morbi ipsum ipsum, porta nec, tempor id, auctor vitae, purus. Pellentesque neque. Nulla luctus erat vitae libero. Integer nec enim. Phasellus aliquam enim et tortor. Quisque aliquet, quam elementum condimentum feugiat, tellus odio consectetuer wisi, vel nonummy sem neque in elit. Curabitur eleifend wisi iaculis ipsum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In non velit non ligula laoreet ultrices. Praesent ultricies facilisis nisl. Vivamus luctus elit sit amet mi. Phasellus pellentesque, erat eget elementum volutpat, dolor nisl porta neque, vitae sodales ipsum nibh in ligula. Maecenas mattis pulvinar diam. Curabitur sed leo.

‎_prose.yml

+20
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,22 @@
11
prose:
22
rooturl: '_posts'
3+
siteurl: 'http://prose.io/starter'
4+
relativeLinks: 'http://prose.io/starter/links.jsonp'
5+
media: '_posts/media'
6+
metadata:
7+
_posts:
8+
- name: "category"
9+
field:
10+
element: "hidden"
11+
value: "blog"
12+
- name: "layout"
13+
element: "layout"
14+
value: "blog"
15+
- name: "Title"
16+
element: "text"
17+
label: "Title"
18+
value: ""
19+
- name: "splash"
20+
element: "text"
21+
label: "Splash image"
22+
value: ""

‎blog.rss

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
origin: /
3+
title: Blog
4+
description: Occasional Blog Posts
5+
---
6+
7+
<?xml version='1.0' encoding='utf-8' ?>
8+
<rss version='2.0' xml:base='{{page.url}}' xmlns:dc='http://purl.org/dc/elements/1.1/'>
9+
<channel>
10+
<title>{{page.title}}</title>
11+
<link>{{site.baseurl}}</link>
12+
<description>{{page.description}}</description>
13+
<language>en</language>
14+
{% for item in site.categories.blog limit:40 %}{% include rss-item.xml %}{% endfor %}
15+
</channel>
16+
</rss>

‎index.html

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
---
22
layout: default
3-
title: untitled
3+
section: blog
44
---
55

6+
<div class='listing col6 pad4h margin3'>
7+
{% for item in site.categories.blog limit:1000 %}
8+
{% capture date %}{{ item.date | date: '%B %Y' }}{% endcapture %}
9+
{% capture ndate %}{{ item.next.date | date: '%B %Y' }}{% endcapture %}
610

7-
Hello World!
11+
{% if date != ndate %}
12+
<h4 class='month'>{{item.date | date: '%B %Y'}}</h4>
13+
{% endif %}
14+
<a class='item' href='{{site.baseurl}}{{item.url}}'>{{item.title}} <span class='date'>&#126; {{item.date | date:"%b %d"}}</span></a>
15+
{% endfor %}
16+
</div>
17+
18+
{% include rss-link.html %}

‎links.jsonp

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
---
3+
callback([
4+
{% for post in site.posts reversed | sort: title %}
5+
{
6+
"text": "{{post.title | replace:'"','\"'}}",
7+
"href": "{{site.baseurl}}{{post.url}}"
8+
} {% unless forloop.last %},{% endunless%}
9+
{% endfor %}
10+
])

‎site.css

+68-12
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ table { border-collapse: collapse; border-spacing:0; }
4343
body,
4444
input,
4545
textarea {
46-
color:#333;
46+
color:#516066;
4747
font:15px/1.67 'Helvetica Neue', Helvetica, Arial, sans-serif;
4848
-webkit-font-smoothing:antialiased;
4949
}
@@ -60,12 +60,12 @@ h4,
6060
h5,
6161
h6 {
6262
margin:0;
63-
font-weight:bold;
63+
font-weight:normal;
6464
}
6565

6666
h1 {
67-
font-size:32px;
68-
margin-bottom:20px;
67+
font-size:42px;
68+
margin-bottom:10px;
6969
line-height:1em;
7070
}
7171

@@ -94,18 +94,26 @@ p {
9494

9595
/* Links */
9696
a {
97-
color:#77c453;
97+
color:#2099aa;
9898
text-decoration:none;
99+
font-weight:bold;
100+
-webkit-transition:color 100ms;
101+
-moz-transition:color 100ms;
102+
-o-transition:color 100ms;
103+
transition:color 100ms;
99104
}
100-
a:visited {
101-
color:#9ed485;
102-
}
103105
a:hover {
104-
color:#54af29;
106+
color:#197987;
107+
}
108+
a.active {
109+
color:#516066;
105110
}
106-
a:active {
107-
color:#9ed485;
111+
.rss {
112+
color:#d4d7d9;
108113
}
114+
.rss:hover {
115+
color:#516066;
116+
}
109117

110118
abbr {
111119
border-bottom:1px dotted #000;
@@ -300,14 +308,59 @@ table {
300308
text-indent:-999em;
301309
}
302310

303-
/* Layout
311+
/* Global Layout
304312
------------------------------------------------------- */
305313
.container {
306314
max-width:1600px;
307315
margin:0 auto;
308316
overflow:hidden;
309317
}
310318

319+
/* Global Style
320+
------------------------------------------------------- */
321+
.heading,
322+
.header {
323+
padding:20px 0;
324+
}
325+
.header .title {
326+
font-size:15px;
327+
line-height:1.67;
328+
font-weight:bold;
329+
margin:0;
330+
}
331+
.header .title a {
332+
color:#516066;
333+
}
334+
335+
.menu {
336+
text-align:right;
337+
}
338+
.menu a {
339+
margin:0 0 0 10px;
340+
}
341+
342+
.listing .item {
343+
display:block;
344+
padding:2px 0;
345+
border-bottom:1px solid #d4d7d9;
346+
}
347+
348+
.listing .month {
349+
color:#868f93;
350+
margin-top:20px;
351+
}
352+
353+
.splash img {
354+
background:#f0f0f0;
355+
margin:0 auto;
356+
display:block;
357+
max-width:100%;
358+
}
359+
.date {
360+
color:#d4d7d9;
361+
font-weight:normal;
362+
}
363+
311364
/* Columns
312365
------------------------------------------------------- */
313366
.col0 { float:left; width:04.1666%; }
@@ -389,7 +442,10 @@ Details: http://www.positioniseverything.net/easyclearing.html
389442
visibility:hidden;
390443
}
391444

445+
.fl { float:left; }
446+
.fr { float:right; }
392447
.clearfix { display:inline-block; }
448+
.centered { text-align:center; }
393449

394450
/* Tablet Layout
395451
------------------------------------------------------- */

0 commit comments

Comments
 (0)