10 files changed, 93 insertions, 7 deletions
diff --git a/source/sass/themes/classic/partials/_blog.scss b/sass/themes/classic/partials/_blog.scss
index 47b48878..1dd255dd 100644
--- a/source/sass/themes/classic/partials/_blog.scss
+++ b/sass/themes/classic/partials/_blog.scss
@@ -1,7 +1,4 @@
 article {
-  h2 {
-    padding-top: 0;
-    margin-bottom: 0.1em; }
   .title {
     text-decoration: none;
     &:hover {
diff --git a/source/sass/themes/classic/partials/_footer.scss b/sass/themes/classic/partials/_footer.scss
index 08e6138c..08e6138c 100644
--- a/source/sass/themes/classic/partials/_footer.scss
+++ b/sass/themes/classic/partials/_footer.scss
diff --git a/source/sass/themes/classic/partials/_header.scss b/sass/themes/classic/partials/_header.scss
index a4964af9..ba7993a8 100644
--- a/source/sass/themes/classic/partials/_header.scss
+++ b/sass/themes/classic/partials/_header.scss
@@ -1,11 +1,13 @@
 body > header {
   background-color: $header_bg;
   border-bottom: 1px solid $header_border;
-  padding: 25px 0;
   h1 {
     display: inline-block;
     margin: 0;
     a, a:visited {
       font-weight: normal;
       color: $title_color;
-      text-decoration: none; } } }
+      text-decoration: none;
+    }
+  }
+}
diff --git a/sass/themes/classic/partials/_navigation.scss b/sass/themes/classic/partials/_navigation.scss
new file mode 100644
index 00000000..30685034
--- /dev/null
+++ b/sass/themes/classic/partials/_navigation.scss
@@ -0,0 +1,67 @@
+body > nav {
+  > div > div {
+    float: right;
+    position: relative;
+    padding: .45em 0 0 0;
+    a {
+      float: right;
+      @include replace-text-with-dimensions('rss.png');
+    }
+    form {
+      margin: 0; padding: 0;
+      @include background-clip(padding-box);
+      input[type='text']{
+        margin: 0;
+        @include border-radius(1em);
+        float: left;
+        border: 1px solid #ccc;
+        color: #888;
+        background: image-url('search.png') no-repeat .5em .4em #f6f6f6;
+        padding: .4em .8em .1em 1.8em;
+        line-height: 1.35em;
+        font-size: .85em;
+        &:focus {
+          color: #444;
+          border-color: #80b1df;
+          @include box-shadow(#80b1df 0 0 4px, #80b1df 0 0 3px inset);
+          background-color: #fff;
+          outline: none;
+        }
+      }
+    }
+  }
+  @extend .group;
+  position: relative;
+  z-index: 1;
+  background-color: $nav-bg;
+  @include background-image(linear-gradient(#fcfcfc, #f4f4f4 0.3, #dddddd));
+  border: {
+    top: 1px solid $nav-border-top;
+    bottom: 1px solid $nav-border-bottom; };
+  ul {
+    position: relative;
+    @include horizontal-list;
+    margin: 0 auto;
+    padding: .5em 0;
+  }
+  ul li {
+    padding: 0 1em;
+    margin: 0;
+    border-left: 1px solid $nav-border-left;
+    border-right: 1px solid $nav-border-right;
+    &:first-child {
+      border-left: none;
+      padding-left: 0; }
+    &:last-child {
+      border-right: 0; }
+    a {
+      display: inline-block;
+      color: $nav-color;
+      line-height: 150%;
+      text-decoration: none;
+      &:hover {
+        color: $nav-color-hover;
+      }
+    }
+  }
+}
diff --git a/source/sass/themes/classic/partials/_page.scss b/sass/themes/classic/partials/_page.scss
index 2a1503b4..414a37e9 100644
--- a/source/sass/themes/classic/partials/_page.scss
+++ b/sass/themes/classic/partials/_page.scss
@@ -2,7 +2,7 @@ body {
   background-color: $sidebar_bg;
 }
 
-#page > div {
+body > div > div {
   background-color: $main_bg; border-right: 1px solid $sidebar_border;
-  @include box-shadow(rgba(#000, .1) 0 0 18px);
+  //@include box-shadow(rgba(#000, .1) 0 0 18px);
 }
diff --git a/sass/themes/classic/partials/_search.scss b/sass/themes/classic/partials/_search.scss
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/sass/themes/classic/partials/_search.scss
diff --git a/source/sass/themes/classic/partials/_shared.scss b/sass/themes/classic/partials/_shared.scss
index a97b6051..a97b6051 100644
--- a/source/sass/themes/classic/partials/_shared.scss
+++ b/sass/themes/classic/partials/_shared.scss
diff --git a/sass/themes/classic/partials/_sidebar.scss b/sass/themes/classic/partials/_sidebar.scss
new file mode 100644
index 00000000..faab4152
--- /dev/null
+++ b/sass/themes/classic/partials/_sidebar.scss
@@ -0,0 +1,20 @@
+#articles + aside {
+  section {
+    @extend .sans-font;
+    font-size: .8em;
+    line-height: 1.5em;
+    margin-bottom: 1.5em;
+  }
+  ul {
+    margin-bottom: 0.5em;
+  }
+  li {
+    list-style: none;
+    padding: .5em 0;
+    margin: 0;
+    border-bottom: 1px solid #ddd;
+    p:last-child {
+      margin-bottom: 0;
+    }
+  }
+}
diff --git a/source/sass/themes/classic/partials/_syntax.scss b/sass/themes/classic/partials/_syntax.scss
index b06a5a10..b06a5a10 100644
--- a/source/sass/themes/classic/partials/_syntax.scss
+++ b/sass/themes/classic/partials/_syntax.scss
diff --git a/source/sass/themes/classic/partials/_twitter.scss b/sass/themes/classic/partials/_twitter.scss
index 5d8b7d97..5d8b7d97 100644
--- a/source/sass/themes/classic/partials/_twitter.scss
+++ b/sass/themes/classic/partials/_twitter.scss