4 files changed, 59 insertions, 36 deletions
diff --git a/themes/classic/sass/default/core/_theme.scss b/themes/classic/sass/default/core/_theme.scss
index 1e54b12c..7aac67e4 100644
--- a/themes/classic/sass/default/core/_theme.scss
+++ b/themes/classic/sass/default/core/_theme.scss
@@ -5,8 +5,6 @@ $link-color-visited: darken(adjust_hue($link_color, 70), 10) !default;
 $link-color-active: darken($link-color-hover, 15) !default;
 
 // Main Section Colors
-$body-color: #333333 !default;
-$light-text: #999999 !default;
 $page-bg: #252525 !default;
 $article-border: #eeeeee !default;
 $main-bg: #f5f5f5 !default;
@@ -16,42 +14,42 @@ $header-border: lighten($header-bg, 15) !default;
 $title-color: #f2f2f2 !default;
 $subtitle-color: #aaa !default;
 
-$type-color: #222 !default;
-$type-color-light: #555 !default;
+$text-color: #222 !default;
+$text-color-light: #aaa !default;
 $type-border: #ddd !default;
 
 
 /* Navigation */
 $nav-bg: #ccc !default;
 $nav-color: darken($nav-bg, 38) !default;
-$nav-color-hover: darken($nav-color, 25);
-$nav-placeholder: desaturate(darken($nav-bg, 10), 15);
-$nav-border: darken($nav-bg, 10);
-$nav-border-top: lighten($nav-bg, 15);
-$nav-border-bottom: darken($nav-bg, 25);
-$nav-border-left: darken($nav-bg, 11);
-$nav-border-right: lighten($nav-bg, 7);
+$nav-color-hover: darken($nav-color, 25) !default;
+$nav-placeholder: desaturate(darken($nav-bg, 10), 15) !default;
+$nav-border: darken($nav-bg, 10) !default;
+$nav-border-top: lighten($nav-bg, 15) !default;
+$nav-border-bottom: darken($nav-bg, 25) !default;
+$nav-border-left: darken($nav-bg, 11) !default;
+$nav-border-right: lighten($nav-bg, 7) !default;
 
 /* Sidebar colors */
 $sidebar-bg: #eee !default;
 $sidebar-link-color: $link-color !default;
 $sidebar-link-color-hover: $link-color-hover !default;
-$sidebar-color: change-color(mix($type-color, $sidebar-bg, 80), $hue: hue($sidebar-bg), $saturation: saturation($sidebar-bg)/2) !default;
-$sidebar-border: desaturate(darken($sidebar-bg, 7), 10);
-$sidebar-border: darken($sidebar-bg, 7);
-$sidebar-link-color-subdued: lighten($sidebar-color, 20);
-$sidebar-link-color-subdued-hover: $sidebar-link-color-hover;
-$twitter-status-link: lighten($sidebar-link-color-subdued, 15);
+$sidebar-color: change-color(mix($text-color, $sidebar-bg, 80), $hue: hue($sidebar-bg), $saturation: saturation($sidebar-bg)/2) !default;
+$sidebar-border: desaturate(darken($sidebar-bg, 7), 10) !default;
+$sidebar-border: darken($sidebar-bg, 7) !default;
+$sidebar-link-color-subdued: lighten($sidebar-color, 20) !default;
+$sidebar-link-color-subdued-hover: $sidebar-link-color-hover !default;
+$twitter-status-link: lighten($sidebar-link-color-subdued, 15) !default;
 
 $footer-color: #999999 !default;
 $footer-bg: #ccc !default;
-$footer-color: darken($footer-bg, 38);
-$footer-color-hover: darken($footer-color, 10);
-$footer-border-top: lighten($footer-bg, 15);
-$footer-border-bottom: darken($footer-bg, 15);
-$footer-link-color: darken($footer-bg, 38);
-$footer-link-color-hover: darken($footer-color, 25);
-$page-border-bottom: darken($footer-bg, 5);
+$footer-color: darken($footer-bg, 38) !default;
+$footer-color-hover: darken($footer-color, 10) !default;
+$footer-border-top: lighten($footer-bg, 15) !default;
+$footer-border-bottom: darken($footer-bg, 15) !default;
+$footer-link-color: darken($footer-bg, 38) !default;
+$footer-link-color-hover: darken($footer-color, 25) !default;
+$page-border-bottom: darken($footer-bg, 5) !default;
 
 // Form Colors
 $fieldset-bg: #ececec;
diff --git a/themes/classic/sass/default/core/_typography.scss b/themes/classic/sass/default/core/_typography.scss
index 1328d9b1..a3e5538d 100644
--- a/themes/classic/sass/default/core/_typography.scss
+++ b/themes/classic/sass/default/core/_typography.scss
@@ -19,7 +19,7 @@ body > header h1 {
 
 body {
   line-height: 1.5em;
-  color: $type-color;
+  color: $text-color;
   @extend .serif;
 }
 
@@ -115,7 +115,7 @@ blockquote {
   + p > cite {
     margin-left: $bq-margin;
     text-align: right;
-    &:before { content: '– '; color: $type-color-light; }
+    &:before { content: '– '; color: $text-color-light; }
     a { font-style: italic; }
   }
 }
@@ -131,11 +131,11 @@ blockquote {
   /* Pull out to the right, modular scale based margins. */
   float: right;
   width: 45%;
-  margin: 1em 0 1em 1.5em;
+  margin: .5em 0 1em 1.5em;
 
   /* Baseline correction */
   position: relative;
-  top: 6px;
+  top: 7px;
   font-size: 1.4em;
   line-height: 1.45em;
 }
diff --git a/themes/classic/sass/default/partials/_blog.scss b/themes/classic/sass/default/partials/_blog.scss
index be6239af..aafdf20c 100644
--- a/themes/classic/sass/default/partials/_blog.scss
+++ b/themes/classic/sass/default/partials/_blog.scss
@@ -14,11 +14,8 @@ $border: inline-image('dotted-border.png');
         padding-top: 0;
       }
     }
-    time + .byline:before, .byline + time +time:before {
-      content: "\2022 ";
-      padding: 0 .3em 0 .2em;
-      display: inline-block;
-      @include opacity(.5);
+    .byline + time:before, time +time:before, .comments:before {
+      @extend .separator;
     }
     header {
       position: relative;
@@ -33,7 +30,7 @@ $border: inline-image('dotted-border.png');
       }
       p {
         font-size: .9em;
-        color: $type-color-light;
+        color: $text-color-light;
         margin: 0;
         @extend .sans;
         &.meta {
@@ -82,9 +79,20 @@ $border: inline-image('dotted-border.png');
     }
     #disqus_thread { }
 
+    iframe.twitter-share-button {
+      //display: block;
+      //margin-top: .5em;
+      //padding: .2em 0;
+      position: relative;
+      top: .3em;
+      padding-left: .5em;
+    }
     footer {
-      padding-top: 15px;
-      time, .author { color: $light-text; }
+      margin-top: 2em;
+      padding-top: 1em;
+      margin-bottom: 1.5em;
+      background: $border top left repeat-x;
+      time, .author { color: $text-color-light; @extend .sans; }
     }
   }
 }
@@ -103,10 +111,25 @@ article + article {
     padding: .4em .8em;
     margin-right: .5em;
     text-decoration: none;
+    color: mix($text-color, $text-color-light);
+    @extend .serif;
     @include transition(background-color, .5s);
     &:hover {
       background: $link-color-hover;
+      text-shadow: none;
       color: $main-bg;
     }
   }
+  footer {
+    @extend .sans;
+    margin-top: 1em;
+    p.meta { color: $text-color-light; }
+    a { color: inherit; &:hover{ color: $link-color-hover;} }
+  }
+}
+
+.separator {
+  content: "\2022 ";
+  padding: 0 .4em 0 .2em;
+  display: inline-block;
 }
diff --git a/themes/classic/sass/default/partials/_syntax.scss b/themes/classic/sass/default/partials/_syntax.scss
index 05a97082..cf012555 100644
--- a/themes/classic/sass/default/partials/_syntax.scss
+++ b/themes/classic/sass/default/partials/_syntax.scss
@@ -69,10 +69,12 @@ p code {
   white-space: no-wrap;
   background: #fff;
   font-size: .9em;
+  line-height: 1.5em;
   color: #555;
   border: 1px solid #ddd;
   @include border-radius(.4em);
   padding: 0 .3em;
+  margin: -1px 0;
 }
 
 .pre-code {