diff --git a/content/about.haml b/content/about.haml
index c3bff31..abbd4c3 100644
--- a/content/about.haml
+++ b/content/about.haml
@@ -1,71 +1,37 @@
---
title: About Ariejan
---
-.row
- .large-8.columns
- :markdown
- ## Hi, I'm Ariejan de Vroom
+:markdown
+ Hi! I'm Ariejan de Vroom, a thirty-two year old Ruby on Rails developer and Software
+ Craftsman. I live in [Breugel, the Netherlands][1] with my fiancée [Laura][2]
+ and work full-time at [Kabisa ICT][3].
- Hi! I'm Ariejan de Vroom, a thirty-two year old Ruby on Rails developer and Software
- Craftsman. I live in [Breugel, the Netherlands][1] with my fiancée [Laura][2]
- and work full-time at [Kabisa ICT][3].
+ I started programming in the mid-nineties with [GW-BASIC][9] and [QBasic][10]. Soon
+ thereafter I discovered [Turbo Pascal][11] and then made the jump to [Delphi][12].
- I started programming in the mid-nineties with [GW-BASIC][9] and [QBasic][10]. Soon
- thereafter I discovered [Turbo Pascal][11] and then made the jump to [Delphi][12].
+ At this point I started playing with lots of different languages and platforms. Then,
+ almost naturally I made the switch to the web and started developing in [PHP][13].
- At this point I started playing with lots of different languages and platforms. Then,
- almost naturally I made the switch to the web and started developing in [PHP][13].
+ Not satisfied with the often messy code from the PHP community I discovered [Ruby on Rails][14]
+ somewhere in 2005. I've been writing Ruby ever since.
- Not satisfied with the often messy code from the PHP community I discovered [Ruby on Rails][14]
- somewhere in 2005. I've been writing Ruby ever since.
+ ### Find out more about me
- ### Find out more about me
+ Check me out on [Twitter][4], [Github][6] or [LinkedIn][5] to get to know me a bit better.
- Check me out on [Twitter][4], [Github][6] or [LinkedIn][5] to get to know me a bit better.
+ If you want to contact me, please use the contact form on this page or [tweet something][4]
+ or [send an email directly][8].
- If you want to contact me, please use the contact form on this page or [tweet something][4]
- or [send an email directly][8].
-
- [1]: http://maps.google.nl/maps?f=q&source=s_q&hl=nl&geocode=&q=eindhoven&sll=52.469397,5.509644&sspn=4.692139,10.942383&ie=UTF8&hq=&hnear=Breugel,+Noord-Brabant&ll=51.440313,5.482178&spn=4.800964,10.942383&t=h&z=7
- [2]: http://laura-oerlemans.net/
- [3]: http://kabisa.nl/
- [4]: http://twitter.com/ariejan
- [5]: http://aj.gs/linkedin
- [6]: http://aj.gs/github
- [8]: mailto:ariejan@ariejan.net
- [9]: http://en.wikipedia.org/wiki/GW-BASIC
- [10]: http://en.wikipedia.org/wiki/Qbasic
- [11]: http://en.wikipedia.org/wiki/Turbo_pascal
- [12]: http://en.wikipedia.org/wiki/Borland_Delphi
- [13]: http://en.wikipedia.org/wiki/Php
- [14]: http://en.wikipedia.org/wiki/Ruby_on_rails
-
- .large-4.columns
- .avatar
-
- %form(id="form1" name="form1" class="wufoo page" autocomplete="off" enctype="multipart/form-data" method="post" novalidate action="https://ariejan.wufoo.com/forms/z7x4z5/#public")
-
- %h3 Leave me a message
-
- %ul
- %li
- %div
- %textarea.field.textarea.medium(name="Field1" spellcheck="true" rows="10" cols="50" tabindex="1" placeholder="How can I be of help?" onkeyup="" required)
-
- %li
- %div
- %input(id="Field4" name="Field4" type="text" class="field text large" value="" maxlength="255" tabindex="2" onkeyup="" placeholder="Your name, please")
-
- %li
- %div
- %input(id="Field2" name="Field2" type="email" spellcheck="false" class="field text large" value="" maxlength="255" tabindex="3" required placeholder="Your email address")
-
- %li.buttons
- %div
- %a.button(href="javascript:{}" onclick="document.getElementById('form1').submit();")
- %span Send message
-
- %li.hide
- %label(for="comment") Do Not Fill This Out
- %textarea(name="comment" id="comment" rows="1" cols="1")
- %input(type="hidden" id="idstamp" name="idstamp" value="CUVI8NzGGu1E9xkpfytNrtxYAhGs8IrYwj0vZn2ji1c=")
+ [1]: http://maps.google.nl/maps?f=q&source=s_q&hl=nl&geocode=&q=eindhoven&sll=52.469397,5.509644&sspn=4.692139,10.942383&ie=UTF8&hq=&hnear=Breugel,+Noord-Brabant&ll=51.440313,5.482178&spn=4.800964,10.942383&t=h&z=7
+ [2]: http://laura-oerlemans.net/
+ [3]: http://kabisa.nl/
+ [4]: http://twitter.com/ariejan
+ [5]: http://aj.gs/linkedin
+ [6]: http://aj.gs/github
+ [8]: mailto:ariejan@ariejan.net
+ [9]: http://en.wikipedia.org/wiki/GW-BASIC
+ [10]: http://en.wikipedia.org/wiki/Qbasic
+ [11]: http://en.wikipedia.org/wiki/Turbo_pascal
+ [12]: http://en.wikipedia.org/wiki/Borland_Delphi
+ [13]: http://en.wikipedia.org/wiki/Php
+ [14]: http://en.wikipedia.org/wiki/Ruby_on_rails
diff --git a/content/craftsmanship.haml b/content/craftsmanship.haml
index ffff1c6..accbcd4 100644
--- a/content/craftsmanship.haml
+++ b/content/craftsmanship.haml
@@ -1,11 +1,6 @@
---
title: Software Craftsmanship
---
-.row
- .large-8.push-2.columns
- :markdown
- # Craftsmanship
+Well, this is awkward. I've got all these great arguments in my head to explain to you why software craftsmanship is so important and great. But I just haven't had any time yet to write them all down for you in a coherent way.
- Well, this is awkward. I've got all these great arguments in my head to explain to you why software craftsmanship is so important and great. But I just haven't had any time yet to write them all down for you in a coherent way.
-
- Please stand-by while I type this up. Soon. Promise!
+Please stand-by while I type this up. Soon. Promise!
diff --git a/content/css/screen.sass b/content/css/screen.sass
index 028e18b..ed970b3 100644
--- a/content/css/screen.sass
+++ b/content/css/screen.sass
@@ -89,7 +89,8 @@ h1, h2, h3, h4, h5, h6
display: inline
color: lighten($text-color, 30%)
- .post
+ .post,
+ .page
h1.title
margin-top: 0
margin-bottom: 20px
@@ -101,6 +102,10 @@ h1, h2, h3, h4, h5, h6
margin-top: 20px
margin-bottom: 0
+ .page
+ h1.title
+ margin-top: 20px
+
#footer
ul.tla
padding-left: 0
diff --git a/content/projects.haml b/content/projects.haml
index 72cdc87..431b7f3 100644
--- a/content/projects.haml
+++ b/content/projects.haml
@@ -1,75 +1,71 @@
---
title: Projects
---
-.row
- .large-6.columns
- :markdown
- ### Open Source Projects
+:markdown
+ ### Open Source Projects
- This is an incomplete list of projects I've been working on in the recent pasts.
- There are several projects that I've worked on, but long since abandoned because
- they became obsolete and were superseded by other alternatives.
+ This is an incomplete list of projects I've been working on in the recent pasts.
+ There are several projects that I've worked on, but long since abandoned because
+ they became obsolete and were superseded by other alternatives.
- #### Focal
+ #### Focal
- Focal is a utility web application that creates sexy and informative burndowns
- for you and your team.
+ Focal is a utility web application that creates sexy and informative burndowns
+ for you and your team.
- Hooked up to the Pivotal Tracker API, Focal will gather information about the
- current iteration on a daily basis and provide you and the team with valuable
- progress information.
+ Hooked up to the Pivotal Tracker API, Focal will gather information about the
+ current iteration on a daily basis and provide you and the team with valuable
+ progress information.
- _Focal is developed by Kabisa._
+ _Focal is developed by Kabisa._
- * [Github](https://github.com/kabisaict/focal)
+ * [Github](https://github.com/kabisaict/focal)
- ### IMDB
+ ### IMDB
- The IMDB gem allows you to programatically access IMDB. Although IMDB does not
- officially expose an API you are able to look at what's on their public pages.
+ The IMDB gem allows you to programatically access IMDB. Although IMDB does not
+ officially expose an API you are able to look at what's on their public pages.
- * [Github](https://github.com/ariejan/imdb)
+ * [Github](https://github.com/ariejan/imdb)
- #### Firefly
+ #### Firefly
- At the height of 140 character limited tweets, URL shortners where the hippest
- thing around.
+ At the height of 140 character limited tweets, URL shortners where the hippest
+ thing around.
- Firefly provides you with a personal url shortner. It can be easily deployed to
- Heroku and it has proven to be able to handle millions of shortened URLs.
+ Firefly provides you with a personal url shortner. It can be easily deployed to
+ Heroku and it has proven to be able to handle millions of shortened URLs.
- * [Website](http://fireflyrb.com)
- * [Github](https://github.com/ariejan/firefly)
+ * [Website](http://fireflyrb.com)
+ * [Github](https://github.com/ariejan/firefly)
- #### PostcodeAPI
+ #### PostcodeAPI
- A simple ruby wrapper around the [Postcode API service](http://www.postcodeapi.nu/).
+ A simple ruby wrapper around the [Postcode API service](http://www.postcodeapi.nu/).
- * [Github](https://github.com/ariejan/postcodeapi)
+ * [Github](https://github.com/ariejan/postcodeapi)
- #### elfproef
+ #### elfproef
- The 11-check is a checksum algorithm used to validate Dutch bank account numbers and
- social security numbers.
+ The 11-check is a checksum algorithm used to validate Dutch bank account numbers and
+ social security numbers.
- This gem allows you to add validations to your Rails models for these kind of fields.
+ This gem allows you to add validations to your Rails models for these kind of fields.
- * [Github](https://github.com/sytzeloor/elfproef)
+ * [Github](https://github.com/sytzeloor/elfproef)
- .large-6.columns
- :markdown
- ### Open Source contributions
+ ### Open Source contributions
- Besides doing my own projects, I've also contributed to a wide variety of open
- source projects. Mostly to scratch my own itch with that project.
+ Besides doing my own projects, I've also contributed to a wide variety of open
+ source projects. Mostly to scratch my own itch with that project.
- * Rails
- * Gitlab
- * rails-i18n
- * elfproef
- * opensourcerails
- * rubber
- * capistrano-resque
+ * Rails
+ * Gitlab
+ * rails-i18n
+ * elfproef
+ * opensourcerails
+ * rubber
+ * capistrano-resque
- Check out my [github profile page](https://github.com/ariejan) for other projects
- and specifics.
+ Check out my [github profile page](https://github.com/ariejan) for other projects
+ and specifics.
diff --git a/content/talks.haml b/content/talks.haml
index 2a26c2f..73fcaa8 100644
--- a/content/talks.haml
+++ b/content/talks.haml
@@ -1,36 +1,24 @@
---
title: Talks by Ariejan
---
-.row
- .large-8.push-2.columns
- :markdown
- # Talks
+:markdown
+ *I'm available for talks and presentations on software craftsmanship for
+ your company or event! If you are interested in having me, please
+ [contact me](/about) to discus details.*
- *I'm available for talks and presentations on software craftsmanship for
- your company or event! If you are interested in having me, please
- [contact me](/about) to discus details.*
+ I love giving talks to motivate and inspire others. My talks can be in-depth
+ technical or on a higher level about clean code and craftsmanship.
- I love giving talks to motivate and inspire others. My talks can be in-depth
- technical or on a higher level about clean code and craftsmanship.
+ Since 2012 I'm keeping track of the talks I've given. You can find the slides to them below.
- ## Previous talks
+ ## Software Craftsmanship
+
+ June 2012
- Since 2012 I'm keeping track of the talks I've given. You can find the slides to them below.
+
-.row
- .large-6.columns
- %h4
- Software Craftsmanship
- %p
- june 2012
- :plain
-
+ ## Introducting Gitlab
+
+ Lightning Talk for Eindhoven.rb, april 2012
-
- .large-6.columns
- %h4
- Introducting Gitlab
- %p
- Lighting Talk, april 2012
- :plain
-
+
diff --git a/layouts/page.haml b/layouts/page.haml
index 35c5b2e..d0fc004 100644
--- a/layouts/page.haml
+++ b/layouts/page.haml
@@ -1,4 +1,15 @@
-%section.page
- #content
- %article.page
- = yield
+.row
+ .col-sm-12
+ .page
+ %h1.title= item[:title]
+
+.row
+ .col-sm-9
+ .page
+ .body
+ = yield
+
+ .col-sm-3.hidden-xs
+ #adpacks
+ .bsarocks.bsap_a40a34b3f2d124df05e7c20ddaa79bd8#bsap_1287881
+ %a(href="http://adpacks.com" id="bsap_aplink") via Ad Packs