-{{ content }}
+{% include header.html %}
+
+
+
+ {% include article.html %}
+
+
+
+{% include footer.html %}
diff --git a/_plugins/date.rb b/_plugins/date.rb
new file mode 100644
index 0000000..229e5cb
--- /dev/null
+++ b/_plugins/date.rb
@@ -0,0 +1,12 @@
+require 'date'
+require 'facets/integer/ordinal'
+
+module Jekyll
+ module DateFilter
+ def pretty(date)
+ "#{date.strftime('%b')} #{date.strftime('%e').to_i.ordinalize}, #{date.strftime('%Y')}"
+ end
+ end
+end
+
+Liquid::Template.register_filter(Jekyll::DateFilter)
diff --git a/_plugins/ext.rb b/_plugins/ext.rb
new file mode 100644
index 0000000..7af062f
--- /dev/null
+++ b/_plugins/ext.rb
@@ -0,0 +1,2 @@
+require 'jekyll-assets'
+require 'jekyll-assets/bourbon'
diff --git a/about/index.markdown b/about/index.markdown
new file mode 100644
index 0000000..9a94569
--- /dev/null
+++ b/about/index.markdown
@@ -0,0 +1,11 @@
+---
+layout: page
+title: "About Dan"
+# date: 2012-01-17 09:07
+comments: false
+sharing: true
+footer: true
+---
+Hi, my name is Dan Barber. I’m a web designer and developer in Devon. I design and build standards compliant websites that are simple, usable and attractive using open source software technologies.
+
+My chosen web technology is Ruby on Rails, and I love creating beautiful and usable interfaces.
diff --git a/atom.xml b/atom.xml
new file mode 100644
index 0000000..83af3f8
--- /dev/null
+++ b/atom.xml
@@ -0,0 +1,27 @@
+---
+layout: nil
+---
+
+
+
+ <![CDATA[{{ site.title }}]]>
+ {{ site.time | date_to_xmlschema }}
+ {{ site.url }}/
+
+
+ Octopress
+
+ {% for post in site.posts limit: 20 %}
+
+ <![CDATA[{{ post.title | cdata_escape }}]]>
+ {{ post.date | date_to_xmlschema }}
+ {{ site.url }}{{ post.id }}
+
+ {% endfor %}
+
diff --git a/css/main.css b/css/main.css
deleted file mode 100755
index 1a2c013..0000000
--- a/css/main.css
+++ /dev/null
@@ -1,160 +0,0 @@
-/*****************************************************************************/
-/*
-/* Common
-/*
-/*****************************************************************************/
-
-/* Global Reset */
-* {
- margin: 0;
- padding: 0;
-}
-
-html, body { height: 100%; }
-
-body {
- background-color: #FFF;
- font: 13.34px Helvetica, Arial, sans-serif;
- font-size: small;
- text-align: center;
-}
-
-h1, h2, h3, h4, h5, h6 {
- font-size: 100%; }
-
-h1 { margin-bottom: 1em; }
-p { margin: 1em 0; }
-
-a { color: #00a; }
-a:hover { color: #000; }
-a:visited { color: #a0a; }
-
-/*****************************************************************************/
-/*
-/* Home
-/*
-/*****************************************************************************/
-.posts {
- list-style-type: none;
- margin-bottom: 2em;
-}
-
-.posts li {
- line-height: 1.75em;
-}
-
-.posts span {
- color: #aaa;
- font-family: Monaco, "Courier New", monospace;
- font-size: 80%;
-}
-
-/*****************************************************************************/
-/*
-/* Site
-/*
-/*****************************************************************************/
-
-.site {
- font-size: 115%;
- text-align: justify;
- width: 42em;
- margin: 3em auto 2em;
- line-height: 1.5em;
-}
-
-.header a {
- font-weight: bold;
- text-decoration: none;
-}
-
-.title {
- display: inline-block;
- margin-bottom: 2em;
-}
-
-.title a {
- color: #a00;
-}
-
-.title a:hover {
- color: #000;
-}
-
-.header a.extra {
- color: #aaa;
- margin-left: 1em;
-}
-
-.header a.extra:hover {
- color: #000;
-}
-
-.meta {
- color: #aaa;
-}
-
-.footer {
- font-size: 80%;
- color: #666;
- border-top: 4px solid #eee;
- margin-top: 2em;
- overflow: hidden;
-}
-
-.footer .contact {
- float: left;
- margin-right: 3em;
-}
-
-.footer .contact a {
- color: #8085C1;
-}
-
-.footer .rss {
- margin-top: 1.1em;
- margin-right: -.2em;
- float: right;
-}
-
-.footer .rss img {
- border: 0;
-}
-
-/*****************************************************************************/
-/*
-/* Posts
-/*
-/*****************************************************************************/
-
-/* standard */
-.post pre {
- border: 1px solid #ddd;
- background-color: #eef;
- padding: 0 .4em;
-}
-
-.post ul, .post ol {
- margin-left: 1.35em;
-}
-
-.post code {
- border: 1px solid #ddd;
- background-color: #eef;
- padding: 0 .2em;
-}
-
-.post pre code {
- border: none;
-}
-
-/* terminal */
-.post pre.terminal {
- border: 1px solid #000;
- background-color: #333;
- color: #FFF;
-}
-
-.post pre.terminal code {
- background-color: #333;
-}
diff --git a/css/syntax.css b/css/syntax.css
deleted file mode 100644
index 2774b76..0000000
--- a/css/syntax.css
+++ /dev/null
@@ -1,60 +0,0 @@
-.highlight { background: #ffffff; }
-.highlight .c { color: #999988; font-style: italic } /* Comment */
-.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
-.highlight .k { font-weight: bold } /* Keyword */
-.highlight .o { font-weight: bold } /* Operator */
-.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
-.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
-.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
-.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
-.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
-.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
-.highlight .ge { font-style: italic } /* Generic.Emph */
-.highlight .gr { color: #aa0000 } /* Generic.Error */
-.highlight .gh { color: #999999 } /* Generic.Heading */
-.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
-.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
-.highlight .go { color: #888888 } /* Generic.Output */
-.highlight .gp { color: #555555 } /* Generic.Prompt */
-.highlight .gs { font-weight: bold } /* Generic.Strong */
-.highlight .gu { color: #aaaaaa } /* Generic.Subheading */
-.highlight .gt { color: #aa0000 } /* Generic.Traceback */
-.highlight .kc { font-weight: bold } /* Keyword.Constant */
-.highlight .kd { font-weight: bold } /* Keyword.Declaration */
-.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
-.highlight .kr { font-weight: bold } /* Keyword.Reserved */
-.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
-.highlight .m { color: #009999 } /* Literal.Number */
-.highlight .s { color: #d14 } /* Literal.String */
-.highlight .na { color: #008080 } /* Name.Attribute */
-.highlight .nb { color: #0086B3 } /* Name.Builtin */
-.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
-.highlight .no { color: #008080 } /* Name.Constant */
-.highlight .ni { color: #800080 } /* Name.Entity */
-.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
-.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
-.highlight .nn { color: #555555 } /* Name.Namespace */
-.highlight .nt { color: #000080 } /* Name.Tag */
-.highlight .nv { color: #008080 } /* Name.Variable */
-.highlight .ow { font-weight: bold } /* Operator.Word */
-.highlight .w { color: #bbbbbb } /* Text.Whitespace */
-.highlight .mf { color: #009999 } /* Literal.Number.Float */
-.highlight .mh { color: #009999 } /* Literal.Number.Hex */
-.highlight .mi { color: #009999 } /* Literal.Number.Integer */
-.highlight .mo { color: #009999 } /* Literal.Number.Oct */
-.highlight .sb { color: #d14 } /* Literal.String.Backtick */
-.highlight .sc { color: #d14 } /* Literal.String.Char */
-.highlight .sd { color: #d14 } /* Literal.String.Doc */
-.highlight .s2 { color: #d14 } /* Literal.String.Double */
-.highlight .se { color: #d14 } /* Literal.String.Escape */
-.highlight .sh { color: #d14 } /* Literal.String.Heredoc */
-.highlight .si { color: #d14 } /* Literal.String.Interpol */
-.highlight .sx { color: #d14 } /* Literal.String.Other */
-.highlight .sr { color: #009926 } /* Literal.String.Regex */
-.highlight .s1 { color: #d14 } /* Literal.String.Single */
-.highlight .ss { color: #990073 } /* Literal.String.Symbol */
-.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
-.highlight .vc { color: #008080 } /* Name.Variable.Class */
-.highlight .vg { color: #008080 } /* Name.Variable.Global */
-.highlight .vi { color: #008080 } /* Name.Variable.Instance */
-.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */
diff --git a/design-for-developers/index.markdown b/design-for-developers/index.markdown
new file mode 100644
index 0000000..97ca37c
--- /dev/null
+++ b/design-for-developers/index.markdown
@@ -0,0 +1,44 @@
+---
+layout: page
+title: "design for developers"
+date: 2013-03-24 09:35
+comments: true
+sharing: true
+footer: true
+---
+
+This is a page of useful links associated with my talk "Design Eye for the Developer Guy".
+
+## Grid
+
+* [Designing With Grid-Based Approach][1]
+* [How You Make A Grid (PDF)][2]
+* [Design & Build a Grid Based Web Design with CSS][3]
+
+## Colour
+
+* [Basic Color Theory][4]
+* [Color Theory for Designers, Part 1: The Meaning of Color][5]
+* [Color Theory For Designers, Part 2: Understanding Concepts And Terminology][6]
+* [Color Theory for Designer, Part 3: Creating Your Own Color Palettes][7]
+* [Color Scheme Designer][8]
+
+## Typography
+
+* [How to Choose a Typeface][9]
+* [Five simple steps to better typography][10] (Internal links from here are broken, but will work again if you remove the trailing slash)
+* [8 Simple Ways to Improve Typography In Your Designs][11]
+* [The Elements of Typographic Style Applied to the Web][12]
+
+ [1]: http://www.smashingmagazine.com/2007/04/14/designing-with-grid-based-approach/
+ [2]: http://typophile.com/files/How%20you%20make%20a%20grid.pdf
+ [3]: http://line25.com/tutorials/design-build-a-grid-based-web-design-with-css
+ [4]: http://www.colormatters.com/color-and-design/basic-color-theory
+ [5]: http://www.smashingmagazine.com/2010/01/28/color-theory-for-designers-part-1-the-meaning-of-color/
+ [6]: http://www.smashingmagazine.com/2010/02/02/color-theory-for-designers-part-2-understanding-concepts-and-terminology/
+ [7]: http://www.smashingmagazine.com/2010/02/08/color-theory-for-designer-part-3-creating-your-own-color-palettes/
+ [8]: http://colorschemedesigner.com
+ [9]: http://www.smashingmagazine.com/2011/03/24/how-to-choose-a-typeface/
+ [10]: http://markboulton.co.uk/journal/five-simple-steps-to-better-typography
+ [11]: http://coding.smashingmagazine.com/2009/04/03/8-simple-ways-to-improve-typography-in-your-designs/
+ [12]: http://webtypography.net
diff --git a/index.html b/index.html
index c726819..ea1c79f 100644
--- a/index.html
+++ b/index.html
@@ -1,13 +1,28 @@
---
layout: default
-title: Your New Jekyll Site
---
-
-
Blog Posts
-
- {% for post in site.posts %}
- {{ post.date | date_to_string }} » {{ post.title }}
-
\ No newline at end of file
+{% assign index = true %}
+
+{% include header.html %}
+
+
+ {% assign index = true %}
+ {% for post in paginator.posts %}
+ {% assign content = post.content %}
+
+ {% include article.html %}
+
+ {% endfor %}
+
+
+
+{% include footer.html %}
diff --git a/sale/index.markdown b/sale/index.markdown
new file mode 100644
index 0000000..f5e37e6
--- /dev/null
+++ b/sale/index.markdown
@@ -0,0 +1,28 @@
+---
+layout: page
+title: "Stuff for sale"
+date: 2014-04-20
+footer: true
+---
+
+I'm selling my DSLR gear to make way for a smaller more compact camera setup. The following items are available. Contact me on sale@danbarber.me if you're interested in any of the items.
+
+Check my [Flickr](https://www.flickr.com/photos/danbee/) stream for example shots from this gear. Most of the photos on there were taken with the 30D with one of the two lenses listed.
+
+Prices don't include shipping.
+
+### [Canon EOS 30D body](http://www.canon.co.uk/For_Home/Product_Finder/Cameras/Digital_SLR/eos30d/) -- £100
+
+This body is in excellent condition and comes with two batteries, charger, cables and manual. I'll throw in a couple of CF cards too.
+
+### [Sigma EX Macro 18-50mm f2.8 lens](http://www.ephotozine.com/article/sigma-18-50-f-2-8-ex-dc-interchangeable-lens-review-4040) -- £150
+
+In excellent condition, with box and case. This is a great alternative to the usual Canon kit lens as it has a wide f2.8 aperture through the zoom range.
+
+### [Canon L series 70-200 f4 USM lens](http://www.canon.co.uk/For_Home/Product_Finder/Cameras/EF_Lenses/Telephoto_Zoom/EF_70-200mm_f4L_USM/) -- £350
+
+Widely regarded as one of the sharpest lenses Canon makes! This is an amazing lens.
+
+### [Canon RS-80N3 remote shutter release](http://www.amazon.co.uk/Canon-Remote-Switch-RS-80-N3/dp/B00007EEA4/ref=sr_1_1?ie=UTF8&qid=1398012676&sr=8-1&keywords=canon+rs+80n3) -- Sold!
+
+Bought new, barely used.