Skip to content

Commit

Permalink
Overhaul of stuff to reflect some of the new changes in Jekyll and co…
Browse files Browse the repository at this point in the history 
…nfiguration options in prose
  • Loading branch information
tristen committed Jun 12, 2013
1 parent f712d17 commit d35d517
Show file tree
Hide file tree
Showing 17 changed files with 218 additions and 23 deletions.
Empty file removed CNAME
View file
Empty file.
7 changes: 3 additions & 4 deletions _config.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
auto: true
server: true
baseurl:
permalink: /:title
baseurl: /starter
permalink: pretty
markdown: rdiscount
8 changes: 8 additions & 0 deletions _includes/rss-item.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<item>
<title>{{item.title | xml_escape}}</title>
<link>http://mapbox.com{{item.url}}</link>
<description>{{item.content | markdownify | xml_escape}}</description>
<pubDate>{{item.date | date_to_xmlschema}}</pubDate>
<dc:creator>SITE NAME</dc:creator>
<guid isPermaLink="true">{{site.baseurl}}{{item.url}}</guid>
</item>
3 changes: 3 additions & 0 deletions _includes/rss-link.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<div class='col4 margin3 pad4'>
<a class='rss' href='{{site.baseurl}}/blog.rss'>Subscribe via RSS</a>
</div>
28 changes: 28 additions & 0 deletions _layouts/blog.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
layout: default
section: blog
---

{% if page.splash %}
{% if page.splash contains 'http' %}
{% capture url %}{{page.splash}}{% endcapture %}
{% else %}
{% capture url %}{{site.baseurl}}{{page.splash}}/{% endcapture %}
{% endif %}

<div class='col12 splash'>
<img src='{{url}}' alt='' />
</div>
{% endif %}

<div class='listing col6 pad4h margin3'>
<div class='heading'>
<h1>{{page.title}}</h1><span class='date'>{{page.date | date:"%b %d"}}</span>
</div>

<div class='prose'>
{{content}}
</div>
</div>

{% include rss-link.html %}
12 changes: 12 additions & 0 deletions _layouts/default.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
title: 'This is my Blog Name'
---
<!DOCTYPE html>
<html>
Expand All @@ -11,6 +12,17 @@
</head>
<body>
<div class='container'>
<div class='col12 clearfix'>
<div class='header col6 margin3 pad4h'>
<div class='clearfix col12'>
<div class='menu fr'>
<a class='{% if page.section == "blog" %}active{% endif %}' href='{{site.baseurl}}/'>Blog</a>
<a class='{% if page.url == "about/" %}active{% endif %}' href='{{site.baseurl}}/about'>About</a>
</div>
<h1 class='title'><a href='{{site.baseurl}}/'>{{page.title}}</a></h1>
</div>
</div>
</div>
{{content}}
</div>
<script src='{{site.baseurl}}/site.js'></script>
Expand Down
10 changes: 10 additions & 0 deletions _layouts/page.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
layout: default
---

<div class='listing col6 pad4h margin3'>
<h2>{{page.title}}</h2>
<div class='prose'>
{{content}}
</div>
</div>
5 changes: 0 additions & 5 deletions _posts/0100-01-01-hello-world.html
View file

This file was deleted.

7 changes: 7 additions & 0 deletions _posts/2013-05-09-hello-world.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
layout: blog
category: blog
splash: 'http://placehold.it/1600x500'
---

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.
7 changes: 7 additions & 0 deletions _posts/2013-06-10-another-post.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
layout: blog
category: blog
splash: 'http://placehold.it/1600x500'
---

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.
7 changes: 7 additions & 0 deletions _posts/2013-06-16-hello-again.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
layout: blog
category: blog
splash: 'http://placehold.it/1600x500'
---

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.
6 changes: 6 additions & 0 deletions _posts/static/0100-01-01-about.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
layout: page
permalink: about/
---

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.
20 changes: 20 additions & 0 deletions _prose.yml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,22 @@
prose:
rooturl: '_posts'
siteurl: 'http://prose.io/starter'
relativeLinks: 'http://prose.io/starter/links.jsonp'
media: '_posts/media'
metadata:
_posts:
- name: "category"
field:
element: "hidden"
value: "blog"
- name: "layout"
element: "layout"
value: "blog"
- name: "Title"
element: "text"
label: "Title"
value: ""
- name: "splash"
element: "text"
label: "Splash image"
value: ""
16 changes: 16 additions & 0 deletions blog.rss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
origin: /
title: Blog
description: Occasional Blog Posts
---

<?xml version='1.0' encoding='utf-8' ?>
<rss version='2.0' xml:base='{{page.url}}' xmlns:dc='http://purl.org/dc/elements/1.1/'>
<channel>
<title>{{page.title}}</title>
<link>{{site.baseurl}}</link>
<description>{{page.description}}</description>
<language>en</language>
{% for item in site.categories.blog limit:40 %}{% include rss-item.xml %}{% endfor %}
</channel>
</rss>
15 changes: 13 additions & 2 deletions index.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
---
layout: default
title: untitled
section: blog
---

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

Hello World!
{% if date != ndate %}
<h4 class='month'>{{item.date | date: '%B %Y'}}</h4>
{% endif %}
<a class='item' href='{{site.baseurl}}{{item.url}}'>{{item.title}} <span class='date'>&#126; {{item.date | date:"%b %d"}}</span></a>
{% endfor %}
</div>

{% include rss-link.html %}
10 changes: 10 additions & 0 deletions links.jsonp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
---
callback([
{% for post in site.posts reversed | sort: title %}
{
"text": "{{post.title | replace:'"','\"'}}",
"href": "{{site.baseurl}}{{post.url}}"
} {% unless forloop.last %},{% endunless%}
{% endfor %}
])
80 changes: 68 additions & 12 deletions site.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ table { border-collapse: collapse; border-spacing:0; }
body,
input,
textarea {
color:#333;
color:#516066;
font:15px/1.67 'Helvetica Neue', Helvetica, Arial, sans-serif;
-webkit-font-smoothing:antialiased;
}
Expand All @@ -60,12 +60,12 @@ h4,
h5,
h6 {
margin:0;
font-weight:bold;
font-weight:normal;
}

h1 {
font-size:32px;
margin-bottom:20px;
font-size:42px;
margin-bottom:10px;
line-height:1em;
}

Expand Down Expand Up @@ -94,18 +94,26 @@ p {

/* Links */
a {
color:#77c453;
color:#2099aa;
text-decoration:none;
font-weight:bold;
-webkit-transition:color 100ms;
-moz-transition:color 100ms;
-o-transition:color 100ms;
transition:color 100ms;
}
a:visited {
color:#9ed485;
}
a:hover {
color:#54af29;
color:#197987;
}
a.active {
color:#516066;
}
a:active {
color:#9ed485;
.rss {
color:#d4d7d9;
}
.rss:hover {
color:#516066;
}

abbr {
border-bottom:1px dotted #000;
Expand Down Expand Up @@ -300,14 +308,59 @@ table {
text-indent:-999em;
}

/* Layout
/* Global Layout
------------------------------------------------------- */
.container {
max-width:1600px;
margin:0 auto;
overflow:hidden;
}

/* Global Style
------------------------------------------------------- */
.heading,
.header {
padding:20px 0;
}
.header .title {
font-size:15px;
line-height:1.67;
font-weight:bold;
margin:0;
}
.header .title a {
color:#516066;
}

.menu {
text-align:right;
}
.menu a {
margin:0 0 0 10px;
}

.listing .item {
display:block;
padding:2px 0;
border-bottom:1px solid #d4d7d9;
}

.listing .month {
color:#868f93;
margin-top:20px;
}

.splash img {
background:#f0f0f0;
margin:0 auto;
display:block;
max-width:100%;
}
.date {
color:#d4d7d9;
font-weight:normal;
}

/* Columns
------------------------------------------------------- */
.col0 { float:left; width:04.1666%; }
Expand Down Expand Up @@ -389,7 +442,10 @@ Details: http://www.positioniseverything.net/easyclearing.html
visibility:hidden;
}

.fl { float:left; }
.fr { float:right; }
.clearfix { display:inline-block; }
.centered { text-align:center; }

/* Tablet Layout
------------------------------------------------------- */
Expand Down

0 comments on commit d35d517

Please sign in to comment.