From 6d652b1b46b18d5e93c90c33341047ba1bb8d493 Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Tue, 26 Jul 2011 11:28:26 -0400
Subject: [PATCH] updated to latest octopress styling

---
 sass/base/_solarized.scss  | 32 ++++++++++++++++----------------
 sass/partials/_blog.scss   | 28 +++++++---------------------
 sass/partials/_syntax.scss |  4 +++-
 3 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/sass/base/_solarized.scss b/sass/base/_solarized.scss
index f4126b0..2a1cfdd 100644
--- a/sass/base/_solarized.scss
+++ b/sass/base/_solarized.scss
@@ -1,18 +1,18 @@
-$base03:    #002b36; //darkest blue
-$base02:    #073642; //dark blue
-$base01:    #586e75; //darkest gray
-$base00:    #657b83; //dark gray
-$base0:     #839496; //medium gray
-$base1:     #93a1a1; //medium light gray
-$base2:     #eee8d5; //cream
-$base3:     #fdf6e3; //white
-$yellow:    #b58900;
-$orange:    #cb4b16;
-$red:       #dc322f;
-$magenta:   #d33682;
-$violet:    #6c71c4;
-$blue:      #268bd2;
-$cyan:      #2aa198;
-$green:     #859900;
+$base03:    #002b36 !default; //darkest blue
+$base02:    #073642 !default; //dark blue
+$base01:    #586e75 !default; //darkest gray
+$base00:    #657b83 !default; //dark gray
+$base0:     #839496 !default; //medium gray
+$base1:     #93a1a1 !default; //medium light gray
+$base2:     #eee8d5 !default; //cream
+$base3:     #fdf6e3 !default; //white
+$yellow:    #b58900 !default;
+$orange:    #cb4b16 !default;
+$red:       #dc322f !default;
+$magenta:   #d33682 !default;
+$violet:    #6c71c4 !default;
+$blue:      #268bd2 !default;
+$cyan:      #2aa198 !default;
+$green:     #859900 !default;
 
 $pre-bg: $base03 !default;
diff --git a/sass/partials/_blog.scss b/sass/partials/_blog.scss
index 64ec3aa..8d9d5f8 100644
--- a/sass/partials/_blog.scss
+++ b/sass/partials/_blog.scss
@@ -43,37 +43,23 @@ article {
     font-size: 2.0em; font-style: italic;
     line-height: 1.3em;
   }
-  img {
+  img, video, .flash-video {
     max-width: 100%;
+    height: auto;
     border: .5em solid #fff;
     @include border-radius(.3em);
     @include box-shadow(rgba(#000, .15) 0 1px 4px);
     @include box-sizing(border-box);
     display: block;
     margin: 0 auto 1.5em;
-    &.left {
-      float: left;
-      margin-right: 1.5em;
-    }
-    &.right {
-      float: right;
-      margin-left: 1.5em;
-    }
-    &.left, &.right {
-      margin-bottom: .8em;
-    }
   }
-  img, video { max-width: 100%; height: auto; }
-  video {
-    width: 100%; display: block; margin-bottom: 1.5em;
-    padding: .8em; background: #fff; border: 1px solid #eee;
-    @include box-sizing(border-box);
+  img {
+    &.left { float: left; margin-right: 1.5em; }
+    &.right { float: right; margin-left: 1.5em; }
+    &.left, &.right { margin-bottom: .8em; }
   }
+  video { display: block; margin-bottom: 1.5em; width: 100%; }
   .flash-video {
-    max-width: 100%;
-    margin-bottom: 1.5em;
-    @include box-sizing(border-box);
-    padding: .8em; background: #fff; border: 1px solid #eee;
     > div {
       position: relative;
       display: block;
diff --git a/sass/partials/_syntax.scss b/sass/partials/_syntax.scss
index bb350ed..4ccd63d 100644
--- a/sass/partials/_syntax.scss
+++ b/sass/partials/_syntax.scss
@@ -126,9 +126,10 @@ p code {
   .n      { color: $blue !important; }
   .na     { color: $blue !important; }                                          /* Name.Attribute */
   .nb     { color: $green !important; }                                          /* Name.Builtin */
-  //.nc     { color: #445588; font-weight: bold }                       /* Name.Class */
+  .nc     { color: $magenta !important;}                                                   /* Name.Class */
   .no     { color: $yellow !important; }                                          /* Name.Constant */
   //.ni     { color: #800080 }                                          /* Name.Entity */
+  .nl     { color: $green !important; }
   .ne     { color: $blue !important; font-weight: bold !important; }                       /* Name.Exception */
   .nf     { color: $blue !important; font-weight: bold !important; }                       /* Name.Function */
   .nn     { color: $yellow !important; }                                          /* Name.Namespace */
@@ -215,3 +216,4 @@ figure[role=code] {
   padding-left: 3em;
 }
 
+