From d35d5172a7763b4e955d52776101d3ecf943c589 Mon Sep 17 00:00:00 2001 From: tristen Date: Wed, 12 Jun 2013 18:48:04 -0400 Subject: [PATCH] Overhaul of stuff to reflect some of the new changes in Jekyll and configuration options in prose --- CNAME | 0 _config.yml | 7 ++- _includes/rss-item.xml | 8 +++ _includes/rss-link.html | 3 ++ _layouts/blog.html | 28 ++++++++++ _layouts/default.html | 12 +++++ _layouts/page.html | 10 ++++ _posts/0100-01-01-hello-world.html | 5 -- _posts/2013-05-09-hello-world.html | 7 +++ _posts/2013-06-10-another-post.html | 7 +++ _posts/2013-06-16-hello-again.html | 7 +++ _posts/static/0100-01-01-about.html | 6 +++ _prose.yml | 20 ++++++++ blog.rss | 16 ++++++ index.html | 15 +++++- links.jsonp | 10 ++++ site.css | 80 ++++++++++++++++++++++++----- 17 files changed, 218 insertions(+), 23 deletions(-) delete mode 100644 CNAME create mode 100644 _includes/rss-item.xml create mode 100644 _includes/rss-link.html create mode 100644 _layouts/blog.html create mode 100644 _layouts/page.html delete mode 100644 _posts/0100-01-01-hello-world.html create mode 100644 _posts/2013-05-09-hello-world.html create mode 100644 _posts/2013-06-10-another-post.html create mode 100644 _posts/2013-06-16-hello-again.html create mode 100644 _posts/static/0100-01-01-about.html create mode 100644 blog.rss create mode 100644 links.jsonp diff --git a/CNAME b/CNAME deleted file mode 100644 index e69de29bb..000000000 diff --git a/_config.yml b/_config.yml index df8256d33..9707631c3 100644 --- a/_config.yml +++ b/_config.yml @@ -1,4 +1,3 @@ -auto: true -server: true -baseurl: -permalink: /:title +baseurl: /starter +permalink: pretty +markdown: rdiscount diff --git a/_includes/rss-item.xml b/_includes/rss-item.xml new file mode 100644 index 000000000..d74227cd2 --- /dev/null +++ b/_includes/rss-item.xml @@ -0,0 +1,8 @@ + + {{item.title | xml_escape}} + http://mapbox.com{{item.url}} + {{item.content | markdownify | xml_escape}} + {{item.date | date_to_xmlschema}} + SITE NAME + {{site.baseurl}}{{item.url}} + diff --git a/_includes/rss-link.html b/_includes/rss-link.html new file mode 100644 index 000000000..eb132a3f6 --- /dev/null +++ b/_includes/rss-link.html @@ -0,0 +1,3 @@ +
+ Subscribe via RSS +
diff --git a/_layouts/blog.html b/_layouts/blog.html new file mode 100644 index 000000000..04488343f --- /dev/null +++ b/_layouts/blog.html @@ -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 %} + +
+ +
+{% endif %} + +
+
+

{{page.title}}

{{page.date | date:"%b %d"}} +
+ +
+ {{content}} +
+
+ +{% include rss-link.html %} diff --git a/_layouts/default.html b/_layouts/default.html index 95cb9a64e..eb4c2bf2e 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,4 +1,5 @@ --- +title: 'This is my Blog Name' --- @@ -11,6 +12,17 @@
+
+
+
+
+ Blog + About +
+

{{page.title}}

+
+
+
{{content}}
diff --git a/_layouts/page.html b/_layouts/page.html new file mode 100644 index 000000000..86b2e262d --- /dev/null +++ b/_layouts/page.html @@ -0,0 +1,10 @@ +--- +layout: default +--- + +
+

{{page.title}}

+
+ {{content}} +
+
diff --git a/_posts/0100-01-01-hello-world.html b/_posts/0100-01-01-hello-world.html deleted file mode 100644 index 7423dfa47..000000000 --- a/_posts/0100-01-01-hello-world.html +++ /dev/null @@ -1,5 +0,0 @@ ---- -layout: default -title: untitled -published: false ---- diff --git a/_posts/2013-05-09-hello-world.html b/_posts/2013-05-09-hello-world.html new file mode 100644 index 000000000..ad5a5d547 --- /dev/null +++ b/_posts/2013-05-09-hello-world.html @@ -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. diff --git a/_posts/2013-06-10-another-post.html b/_posts/2013-06-10-another-post.html new file mode 100644 index 000000000..ad5a5d547 --- /dev/null +++ b/_posts/2013-06-10-another-post.html @@ -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. diff --git a/_posts/2013-06-16-hello-again.html b/_posts/2013-06-16-hello-again.html new file mode 100644 index 000000000..ad5a5d547 --- /dev/null +++ b/_posts/2013-06-16-hello-again.html @@ -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. diff --git a/_posts/static/0100-01-01-about.html b/_posts/static/0100-01-01-about.html new file mode 100644 index 000000000..ae15c44be --- /dev/null +++ b/_posts/static/0100-01-01-about.html @@ -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. diff --git a/_prose.yml b/_prose.yml index 861f9a345..54acae11e 100644 --- a/_prose.yml +++ b/_prose.yml @@ -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: "" diff --git a/blog.rss b/blog.rss new file mode 100644 index 000000000..e90d1b57f --- /dev/null +++ b/blog.rss @@ -0,0 +1,16 @@ +--- +origin: / +title: Blog +description: Occasional Blog Posts +--- + + + + + {{page.title}} + {{site.baseurl}} + {{page.description}} + en + {% for item in site.categories.blog limit:40 %}{% include rss-item.xml %}{% endfor %} + + diff --git a/index.html b/index.html index a0921930f..8bc545b3b 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,18 @@ --- layout: default -title: untitled +section: blog --- +
+ {% 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 %} +

{{item.date | date: '%B %Y'}}

+ {% endif %} + {{item.title}} ~ {{item.date | date:"%b %d"}} + {% endfor %} +
+ +{% include rss-link.html %} diff --git a/links.jsonp b/links.jsonp new file mode 100644 index 000000000..846929948 --- /dev/null +++ b/links.jsonp @@ -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 %} +]) diff --git a/site.css b/site.css index 38604cecb..202d650a2 100644 --- a/site.css +++ b/site.css @@ -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; } @@ -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; } @@ -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; @@ -300,7 +308,7 @@ table { text-indent:-999em; } -/* Layout +/* Global Layout ------------------------------------------------------- */ .container { max-width:1600px; @@ -308,6 +316,51 @@ table { 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%; } @@ -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 ------------------------------------------------------- */