From 2eee2e7ffd5ced7decc946c7d53bcc6b0728c744 Mon Sep 17 00:00:00 2001
From: Ariejan de Vroom <ariejan@ariejan.net>
Date: Thu, 25 Jul 2013 17:14:02 +0200
Subject: [PATCH] Better styling than evah

---
 content/css/_colours.sass    | 10 +++++++++-
 content/css/_layout.sass     | 26 +++++++-------------------
 content/css/_typography.sass |  6 +++---
 layouts/default.haml         | 26 +++++++++++---------------
 layouts/post.haml            |  4 ++++
 5 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/content/css/_colours.sass b/content/css/_colours.sass
index e17cc98..4281f1d 100644
--- a/content/css/_colours.sass
+++ b/content/css/_colours.sass
@@ -1,5 +1,13 @@
+$aj-text: #393939
+$aj-blue: $peterriver
+
 body
-  background-color: #666
+  background-color: #737373
+  color: $aj-text
+
+a
+  color: $aj-blue
+  text-decoration: none
 
 section#page
   background-color: #ffffff
diff --git a/content/css/_layout.sass b/content/css/_layout.sass
index 1478ef8..34a10d6 100644
--- a/content/css/_layout.sass
+++ b/content/css/_layout.sass
@@ -1,5 +1,4 @@
-$max-width: em(1280)
-
+$max-width: em(980)
 $mobile: new-breakpoint(max-width 480px)
 
 section#wrapper
@@ -10,28 +9,17 @@ section#wrapper
     border: rhythm(0.5) solid transparent
 
   section#page
-    @include outer-container
-
     padding: rhythm(2)
 
     @include media($mobile)
       padding: rhythm(1)
 
-    header
-      @include span-columns(12)
+nav#primary,
+nav#social
+  ol
+    list-style-type: none
 
-    section#main
-      section#content
-        @include span-columns(9)
+    li
+      display: inline-block
 
-        @include media($mobile)
-          @include span-columns(12)
 
-      aside#sidebar
-        @include span-columns(3)
-
-        @include media($mobile)
-          @include span-columns(12)
-
-    footer
-      @include span-columns(12)
diff --git a/content/css/_typography.sass b/content/css/_typography.sass
index 6576ccd..92a55fb 100644
--- a/content/css/_typography.sass
+++ b/content/css/_typography.sass
@@ -1,5 +1,5 @@
-$base-font-size: 13px
-$base-line-height: 18px
+$base-font-size: 14px
+$base-line-height: 22px
 
 @import "compass/typography"
 
@@ -10,4 +10,4 @@ html
 
 #title
   h1
-    @include adjust-font-size-to(36px)
+    @include adjust-font-size-to(48px)
diff --git a/layouts/default.haml b/layouts/default.haml
index 3f6ea44..992d8a7 100644
--- a/layouts/default.haml
+++ b/layouts/default.haml
@@ -38,29 +38,25 @@
           %h1= link_to "ariejan.net", "https://ariejan.net/"
 
           %nav#primary
-            %ol.interal
+            %ol
               %li= link_to "Home", "/"
               %li= link_to "Projects", "/projects/"
               %li= link_to "Craftsmanship", "/craftsmanship/"
               %li= link_to "Talks", "/talks/"
               %li= link_to "About", "/about/"
 
-        %section#main
-          %section#content
-            = yield
+          %nav#social
+            %ol
+              %li= link_to "github", "https://github.com/ariejan"
+              %li= link_to "twitter", "https://twitter.com/ariejan"
+              %li= link_to "linkedin", "http://www.linkedin.com/in/ariejan"
+              %li= link_to "RSS", "https://ariejan.net/rss.xml"
+              %li= link_to "Contact", "mailto:ariejan@ariejan.net"
+
+        %section#content
+          = yield
 
-          %aside#sidebar
-            #adpack
-              .bsarocks.bsap_a40a34b3f2d124df05e7c20ddaa79bd8#bsap_1287881
-              %a(href="http://adpacks.com" id="bsap_aplink") via Ad Packs
 
-            %nav#social
-              %ol
-                %li= link_to "github", "https://github.com/ariejan"
-                %li= link_to "twitter", "https://twitter.com/ariejan"
-                %li= link_to "linkedin", "http://www.linkedin.com/in/ariejan"
-                %li= link_to "RSS", "https://ariejan.net/rss.xml"
-                %li= link_to "Contact", "mailto:ariejan@ariejan.net"
 
         %footer
           .copyright
diff --git a/layouts/post.haml b/layouts/post.haml
index a8e40c7..ffc92df 100644
--- a/layouts/post.haml
+++ b/layouts/post.haml
@@ -5,6 +5,10 @@
     %p.meta
       Written by <strong>Ariejan de Vroom</strong> on #{get_pretty_date(item)}.
 
+  %section#adpack
+    .bsarocks.bsap_a40a34b3f2d124df05e7c20ddaa79bd8#bsap_1287881
+    %a(href="http://adpacks.com" id="bsap_aplink") via Ad Packs
+
   %section#body
     = yield