merge on another machine

.editorconfig

@@ -0,0 +1,22 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://EditorConfig.org
+
+root = true
+
+; Use 2 spaces for indentation in all Ruby files
+
+[*.rb]
+indent_style = space
+indent_size = 2
+
+[Rakefile]
+indent_style = space
+indent_size = 2
+
+[Gemfile*]
+indent_style = space
+indent_size = 2
+
+[config.ru]
+indent_style = space
+indent_size = 2

.gitattributes

@@ -0,0 +1 @@
+* text=auto

.gitignore

@@ -0,0 +1,10 @@
+_site/
+_deploy/
+public/
+.editorconfig
+.git
+.powrc
+.pygments-cache
+.sass-cache
+.slugignore
+.themes

.powrc

@@ -0,0 +1,5 @@
+if [ -f "$rvm_path/scripts/rvm" ] && [ -f ".rvmrc" ] ; then
+  source "$rvm_path/scripts/rvm"
+  source ".rvmrc"
+fi
+

.slugignore

@@ -0,0 +1,3 @@
+plugins
+sass
+source

.themes/classic/.editorconfig

@@ -0,0 +1,44 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://EditorConfig.org
+
+
+; Use 2 spaces for indentation in SCSS, JavaScript, HTML, and XML
+
+[*.scss]
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.html]
+indent_style = space
+indent_size = 2
+
+[*.xml]
+indent_style = space
+indent_size = 2
+
+
+; Use 4 spaces for indentation in Markdown files
+
+[*.md]
+indent_style = space
+indent_size = 4
+
+[*.markdown]
+indent_style = space
+indent_size = 4
+
+
+; Override default indentation for some library files
+
+[jwplayer/glow/glow.xml]
+indent_style = tab
+
+[libs/jXHR.js]
+indent_style = tab
+
+[libs/swfobject-dynamic.js]
+indent_style = tab

.themes/classic/sass/_base.scss

@@ -0,0 +1,5 @@
+@import "base/utilities";
+@import "base/solarized";
+@import "base/theme";
+@import "base/typography";
+@import "base/layout";

.themes/classic/sass/_partials.scss

@@ -0,0 +1,8 @@
+@import "partials/header";
+@import "partials/navigation";
+@import "partials/blog";
+@import "partials/sharing";
+@import "partials/syntax";
+@import "partials/archive";
+@import "partials/sidebar";
+@import "partials/footer";

.themes/classic/sass/base/_layout.scss

@@ -0,0 +1,192 @@
+$max-width: 1200px !default;
+
+// Padding used for layout margins
+$pad-min: 18px !default;
+$pad-narrow: 25px !default;
+$pad-medium: 35px !default;
+$pad-wide: 55px !default;
+
+// Sidebar widths used in media queries
+$sidebar-width-medium: 240px !default;
+$sidebar-pad-medium: 15px !default;
+$sidebar-pad-wide: 20px !default;
+$sidebar-width-wide: 300px !default;
+
+$indented-lists: false !default;
+
+$header-font-size: 1em !default;
+$header-padding-top: 1.5em !default;
+$header-padding-bottom: 1.5em !default;
+
+.group { @include pie-clearfix; }
+
+@mixin collapse-sidebar {
+  float: none;
+  width: auto;
+  clear: left;
+  margin: 0;
+  padding: 0 $pad-medium 1px;
+  background-color: lighten($sidebar-bg, 2);
+  border-top: 1px solid lighten($sidebar-border, 4);
+  section {
+    &.odd, &.even { float: left; width: 48%; }
+    &.odd { margin-left: 0; }
+    &.even { margin-left: 4%; }
+  }
+  &.thirds section {
+    width: 30%;
+    margin-left: 5%;
+    &.first {
+      margin-left: 0;
+      clear: both;
+    }
+  }
+}
+
+body {
+  -webkit-text-size-adjust: none;
+  max-width: $max-width;
+  position: relative;
+  margin: 0 auto;
+  > header, > nav, > footer, #content > article, #content > div > article, #content > div > section {
+    @extend .group;
+    padding-left: $pad-min;
+    padding-right: $pad-min;
+    @media only screen and (min-width: 480px) {
+      padding-left: $pad-narrow;
+      padding-right: $pad-narrow;
+    }
+    @media only screen and (min-width: 768px) {
+      padding-left: $pad-medium;
+      padding-right: $pad-medium;
+    }
+    @media only screen and (min-width: 992px) {
+      padding-left: $pad-wide;
+      padding-right: $pad-wide;
+    }
+  }
+  div.pagination {
+    @extend .group;
+    margin-left: $pad-min;
+    margin-right: $pad-min;
+    @media only screen and (min-width: 480px) {
+      margin-left: $pad-narrow;
+      margin-right: $pad-narrow;
+    }
+    @media only screen and (min-width: 768px) {
+      margin-left: $pad-medium;
+      margin-right: $pad-medium;
+    }
+    @media only screen and (min-width: 992px) {
+      margin-left: $pad-wide;
+      margin-right: $pad-wide;
+    }
+  }
+  > header {
+    font-size: $header-font-size;
+    padding-top: $header-padding-top;
+    padding-bottom: $header-padding-bottom;
+  }
+}
+
+#content {
+  overflow: hidden;
+  > div, > article { width: 100%; }
+}
+
+aside.sidebar {
+  float: none;
+  padding: 0 $pad-min 1px;
+  background-color: lighten($sidebar-bg, 2);
+  border-top: 1px solid $sidebar-border;
+  @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 {
+  @media only screen and (min-width: 750px) {
+    aside.sidebar{ @include collapse-sidebar; }
+  }
+  #content { margin-right: 0px; }
+  .toggle-sidebar { display: none; }
+}
+
+@media only screen and (min-width: 550px) {
+  body > header { font-size: $header-font-size; }
+}
+@media only screen and (min-width: 750px) {
+  aside.sidebar { @include collapse-sidebar; }
+}
+#main, #content, .sidebar {
+  @extend .group;
+}
+@media only screen and (min-width: 768px) {
+  body { -webkit-text-size-adjust: auto; }
+  body > header { font-size: $header-font-size * 1.2; }
+  #main {
+    padding: 0;
+    margin: 0 auto;
+  }
+  #content {
+    overflow: visible;
+    margin-right: $sidebar-width-medium;
+    position: relative;
+    .no-sidebar & { margin-right: 0; border-right: 0; }
+    .collapse-sidebar & { margin-right: 20px; }
+    > div, > article {
+      padding-top: $pad-medium/2;
+      padding-bottom: $pad-medium/2;
+      float: left;
+    }
+  }
+  aside.sidebar {
+    width: $sidebar-width-medium - $sidebar-pad-medium*2;
+    padding: 0 $sidebar-pad-medium $sidebar-pad-medium;
+    background: none;
+    clear: none;
+    float: left;
+    margin: 0 -100% 0 0;
+    section {
+      width: auto; margin-left: 0;
+      &.odd, &.even { float: none; width: auto; margin-left: 0; }
+    }
+    .collapse-sidebar & {
+      @include collapse-sidebar;
+    }
+  }
+}
+
+@media only screen and (min-width: 992px) {
+  body > header { font-size: $header-font-size * 1.3; }
+  #content { margin-right: $sidebar-width-wide; }
+  #content {
+    > div, > article {
+      padding-top: $pad-wide/2;
+      padding-bottom: $pad-wide/2;
+    }
+  }
+  aside.sidebar {
+    width: $sidebar-width-wide - $sidebar-pad-wide*2;
+    padding: 1.2em $sidebar-pad-wide $sidebar-pad-wide;
+    .collapse-sidebar & {
+      padding: { left: $pad-wide; right: $pad-wide; }
+    }
+  }
+}
+
+@if $indented-lists == false {
+  @media only screen and (min-width: 768px) {
+    ul, ol { margin-left: 0; }
+  }
+}
+

.themes/classic/sass/base/_solarized.scss

@@ -0,0 +1,46 @@
+$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
+$solar-yellow:    #b58900 !default;
+$solar-orange:    #cb4b16 !default;
+$solar-red:       #dc322f !default;
+$solar-magenta:   #d33682 !default;
+$solar-violet:    #6c71c4 !default;
+$solar-blue:      #268bd2 !default;
+$solar-cyan:      #2aa198 !default;
+$solar-green:     #859900 !default;
+
+$solarized: dark !default;
+
+@if $solarized == light {
+
+  $_base03: $base03;
+  $_base02: $base02;
+  $_base01: $base01;
+  $_base00: $base00;
+  $_base0:  $base0;
+  $_base1:  $base1;
+  $_base2:  $base2;
+  $_base3:  $base3;
+
+  $base03:  $_base3;
+  $base02:  $_base2;
+  $base01:  $_base1;
+  $base00:  $_base0;
+  $base0:   $_base00;
+  $base1:   $_base01;
+  $base2:   $_base02;
+  $base3:   $_base03;
+}
+
+/* non highlighted code colors */
+$pre-bg: $base03 !default;
+$pre-border: darken($base02, 5) !default;
+$pre-color: $base1 !default;
+
+