From 8e6da4ee38239f7f2908e9939b83c87bf2e930e5 Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Sun, 3 Jul 2011 18:11:54 -0400
Subject: [PATCH] refactored styling of colors for code blocks, reduced
 specificty on .feature class for blog posts

---
 .themes/classic/sass/base/_solarized.scss  |  2 ++
 .themes/classic/sass/base/_theme.scss      | 10 ++++++++--
 .themes/classic/sass/partials/_blog.scss   |  2 +-
 .themes/classic/sass/partials/_syntax.scss | 14 +++++++-------
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.themes/classic/sass/base/_solarized.scss b/.themes/classic/sass/base/_solarized.scss
index 4952120..f4126b0 100644
--- a/.themes/classic/sass/base/_solarized.scss
+++ b/.themes/classic/sass/base/_solarized.scss
@@ -14,3 +14,5 @@ $violet:    #6c71c4;
 $blue:      #268bd2;
 $cyan:      #2aa198;
 $green:     #859900;
+
+$pre-bg: $base03 !default;
diff --git a/.themes/classic/sass/base/_theme.scss b/.themes/classic/sass/base/_theme.scss
index 42fdb6f..34474fa 100644
--- a/.themes/classic/sass/base/_theme.scss
+++ b/.themes/classic/sass/base/_theme.scss
@@ -1,3 +1,4 @@
+$noise-bg: image-url('noise.png') top left;
 $img-border: inline-image('dotted-border.png');
 
 // Main Link Colors
@@ -20,6 +21,10 @@ $text-color: #222 !default;
 $text-color-light: #aaa !default;
 $type-border: #ddd !default;
 
+/* non highlighted code colors */
+$pre-bg: $base03 !default;
+$pre-border: $base02 !default;
+$pre-color: $base1 !default;
 
 /* Navigation */
 $nav-bg: #ccc !default;
@@ -66,11 +71,12 @@ html {
 }
 body {
   > div {
-    background: $sidebar-bg image-url('noise.png') top left;
+    background: $sidebar-bg $noise-bg;
     border-bottom: 1px solid $page-border-bottom;
     > div {
-      background: $main-bg image-url('noise.png') top left;
+      background: $main-bg $noise-bg;
       border-right: 1px solid $sidebar-border;
     }
   }
 }
+
diff --git a/.themes/classic/sass/partials/_blog.scss b/.themes/classic/sass/partials/_blog.scss
index 0cf11ae..50fef17 100644
--- a/.themes/classic/sass/partials/_blog.scss
+++ b/.themes/classic/sass/partials/_blog.scss
@@ -43,7 +43,7 @@
       p.meta { position: absolute; top: 0; }
     }
   }
-  h1.feature {
+  .feature {
     padding-top: .5em;
     margin-bottom: 1em;
     padding-bottom: 1em;
diff --git a/.themes/classic/sass/partials/_syntax.scss b/.themes/classic/sass/partials/_syntax.scss
index b14b23b..523010b 100644
--- a/.themes/classic/sass/partials/_syntax.scss
+++ b/.themes/classic/sass/partials/_syntax.scss
@@ -1,10 +1,9 @@
-$pre-bg: image-url('noise.png') top left;
 .highlight, html .gist .gist-file .gist-syntax .gist-highlight {
   .line-numbers {
     text-align: right;
     font-size: .8em;
     line-height: 1.45em;
-    background: $base02 $pre-bg !important;
+    background: $base02 $noise-bg !important;
     border-right: 1px solid darken($base03, 2) !important;
     @include box-shadow(lighten($base02, 2) -1px 0 inset);
     text-shadow: darken($base02, 10) 0 -1px;
@@ -32,7 +31,7 @@ html .gist .gist-file {
    border: 1px solid lighten($base02, 2) !important;
    color: $base01;
    font-size: .7em !important;
-   background: $base02 $pre-bg;
+   background: $base02 $noise-bg;
    @extend .sans;
    line-height: 1.5em;
     a {
@@ -53,15 +52,15 @@ html .gist .gist-file {
   }
 }
 pre {
-  background: $base03 $pre-bg;
+  background: $pre-bg $noise-bg;
   @include border-radius(.4em);
   @extend .mono;
-  border: 1px solid $base02;
+  border: 1px solid $pre-border;
   line-height: 1.45em;
   font-size: .8em;
   margin-bottom: 1.5em;
   padding: .8em 1em;
-  color: $base1;
+  color: $pre-color;
   overflow: auto;
 }
 h3.filename {
@@ -91,7 +90,7 @@ p code {
   padding: .8em !important;
   overflow-x: auto;
   line-height: 1.45em;
-  background: $base03 $pre-bg !important;
+  background: $base03 $noise-bg !important;
   color: $base1 !important;
   span { color: $base1 !important; }
   span { font-style: normal !important; font-weight: normal !important; }
@@ -206,3 +205,4 @@ figure {
   padding-left: 3em;
 }
 
+