3 files changed, 36 insertions, 45 deletions
diff --git a/source/layouts/article_layout.html.haml b/source/layouts/article_layout.html.haml
new file mode 100644
index 0000000..450d470
--- /dev/null
+++ b/source/layouts/article_layout.html.haml
@@ -0,0 +1,7 @@
+-# TODO de-duplicate with _article partial
+= wrap_layout :layout do
+  %article
+    %aside.blog-date= current_article.date.strftime('%e %b %Y')
+      .blog-inner
+        %h3.blog-article-heading= current_article.title
+          = yield
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
deleted file mode 100644
index 030e78c..0000000
--- a/source/layouts/layout.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
-
-    <!-- For proper display on mobile -->
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title><%= current_page.data.title || "sublab" %></title>
-
-    <%= stylesheet_link_tag "base" %>
-    <%#= stylesheet_link_tag "http://localhost:9393/status.css" %>
-
-    <%= javascript_include_tag "all"%>
-  </head>
-
-  <body class="<%= page_classes %>">
-
-    <!-- header -->
-    <header>
-      <div id="logo">
-        <% link_to '/index.html' do %>
-          <%= image_tag 'sublab-logo.png', class: "img-responsive" %>
-        <% end %>
-      </div>
-    </header>
-
-    <!-- main navigation -->
-    <nav>
-      <%= partial "navigation" %>
-    </nav>
-
-    <!-- content -->
-    <div id="content">
-      <section id="main">
-        <%= yield %>
-      </section>
-    </div>
-
-  </body>
-</html>
diff --git a/source/layouts/layout.haml b/source/layouts/layout.haml
new file mode 100644
index 0000000..cd62804
--- /dev/null
+++ b/source/layouts/layout.haml
@@ -0,0 +1,29 @@
+<!doctype html>
+%html
+  %head
+    %meta{:charset => "utf-8"}/
+    / Always force latest IE rendering engine or request Chrome Frame
+    %meta{:content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible"}/
+    / For proper display on mobile
+    %meta{:content => "width=device-width, initial-scale=1", :name => "viewport"}/
+    / Use title if it's in the page YAML frontmatter
+    %title= current_page.data.title || "sublab"
+    = stylesheet_link_tag "base"
+    = javascript_include_tag "modernizr", "all"
+  %body{:class => page_classes}
+    / header
+    %header
+      #logo
+        - link_to '/index.html' do
+          = image_tag 'sublab-logo.png', class: "img-responsive"
+    / main navigation
+    = partial "navigation"
+    / content
+    #content
+      %section#main
+        .row
+          .columns
+            = yield
+    / javascript initialization
+    :javascript
+      $(document).foundation();