From 105e446bd2a3b9d2515af3dd0801a6646be5278f Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Mon, 22 Aug 2011 16:30:40 -0400
Subject: [PATCH] updated to latest octopress

---
 sass/base/_layout.scss           |  9 +++++++++
 sass/base/_utilities.scss        |  7 +++++++
 sass/partials/_blog.scss         | 19 +++++--------------
 sass/partials/_syntax.scss       |  3 ++-
 sass/partials/sidebar/_base.scss |  5 +++++
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/sass/base/_layout.scss b/sass/base/_layout.scss
index ef47279..f6fa5a5 100644
--- a/sass/base/_layout.scss
+++ b/sass/base/_layout.scss
@@ -75,6 +75,15 @@ aside[role=sidebar] {
   @extend .group;
 }
 
+.flex-content { max-width: 100%; height: auto; }
+
+.basic-alignment {
+  &.left { float: left; margin-right: 1.5em; }
+  &.right { float: right; margin-left: 1.5em; }
+  &.center { display:block; margin: 0 auto 1.5em; }
+  &.left, &.right { margin-bottom: .8em; }
+}
+
 .toggle-sidebar { &, .no-sidebar & { display: none; }}
 
 body.sidebar-footer {
diff --git a/sass/base/_utilities.scss b/sass/base/_utilities.scss
index 8b718cd..2d49e65 100644
--- a/sass/base/_utilities.scss
+++ b/sass/base/_utilities.scss
@@ -5,6 +5,13 @@
   height: image-height($img);
 }
 
+@mixin shadow-box($border: #fff .5em solid, $shadow: rgba(#000, .15) 0 1px 4px, $border-radius: .3em) {
+  @include border-radius($border-radius);
+  @include box-shadow($shadow);
+  @include box-sizing(border-box);
+  border: $border;
+}
+
 @mixin selection($bg, $color: inherit, $text-shadow: none){
   * {
     &::-moz-selection { background: $bg; color: $color; text-shadow: $text-shadow; }
diff --git a/sass/partials/_blog.scss b/sass/partials/_blog.scss
index 8d9d5f8..558f0a2 100644
--- a/sass/partials/_blog.scss
+++ b/sass/partials/_blog.scss
@@ -44,21 +44,12 @@ article {
     line-height: 1.3em;
   }
   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;
+    @extend .flex-content;
+    @extend .basic-alignment;
+    @include shadow-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%; }
+  video, .flash-video { margin: 0 auto 1.5em; }
+  video { display: block; width: 100%; }
   .flash-video {
     > div {
       position: relative;
diff --git a/sass/partials/_syntax.scss b/sass/partials/_syntax.scss
index 9bee302..7e8ed8d 100644
--- a/sass/partials/_syntax.scss
+++ b/sass/partials/_syntax.scss
@@ -85,7 +85,8 @@ h3.filename {
   + pre { @include border-top-radius(0px); }
 }
 
-p code {
+p code,
+li code {
   @extend .mono;
   display: inline-block;
   white-space: no-wrap;
diff --git a/sass/partials/sidebar/_base.scss b/sass/partials/sidebar/_base.scss
index 08f04d2..a0d1c09 100644
--- a/sass/partials/sidebar/_base.scss
+++ b/sass/partials/sidebar/_base.scss
@@ -20,6 +20,11 @@ aside[role=sidebar] {
       }
     }
   }
+  img {
+    @extend .flex-content;
+    @extend .basic-alignment;
+    @include shadow-box($border: #fff .3em solid);
+  }
   ul {
     margin-bottom: 0.5em;
     margin-left: 0;