Merge branch 'master' of https://github.com/imathis/octopress

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	_config.yml
	plugins/date.rb
	plugins/image_tag.rb
	plugins/octopress_filters.rb
	plugins/pullquote.rb
	plugins/titlecase.rb

Author: joshkerr

.gitignore

@@ -9,3 +9,4 @@ source.old
 source/_stash
 source/stylesheets/screen.css
 vendor
+node_modules

.rbenv-version

@@ -0,0 +1 @@
+1.9.2-p290

.rvmrc

@@ -1 +1 @@
-rvm 1.9.2
+rvm use 1.9.2

.slugignore

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

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

@@ -14,6 +14,10 @@ $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 {
@@ -32,7 +36,10 @@ $indented-lists: false !default;
   &.thirds section {
     width: 30%;
     margin-left: 5%;
-    &.first { margin-left: 0; }
+    &.first {
+      margin-left: 0;
+      clear: both;
+    }
   }
 }
 
@@ -41,7 +48,7 @@ body {
   max-width: $max-width;
   position: relative;
   margin: 0 auto;
-  > header, > nav, > footer, #content > article, #content > div > article, #content > div > section, nav.pagination {
+  > header, > nav, > footer, #content > article, #content > div > article, #content > div > section {
     @extend .group;
     padding-left: $pad-min;
     padding-right: $pad-min;
@@ -58,10 +65,27 @@ body {
       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: 1em;
-    padding-top: 1.5em;
-    padding-bottom: 1.5em;
+    font-size: $header-font-size;
+    padding-top: $header-padding-top;
+    padding-bottom: $header-padding-bottom;
   }
 }
 
@@ -95,14 +119,14 @@ body.sidebar-footer {
 }
 
 @media only screen and (min-width: 550px) {
-  body > header { font-size: 1em; }
+  body > header { font-size: $header-font-size; }
 }
 @media only screen and (min-width: 750px) {
   aside.sidebar { @include collapse-sidebar; }
 }
 @media only screen and (min-width: 768px) {
   body { -webkit-text-size-adjust: auto; }
-  body > header { font-size: 1.2em; }
+  body > header { font-size: $header-font-size * 1.2; }
   #main {
     @extend .group;
     padding: 0;
@@ -139,7 +163,7 @@ body.sidebar-footer {
 }
 
 @media only screen and (min-width: 992px) {
-  body > header { font-size: 1.3em; }
+  body > header { font-size: $header-font-size * 1.3; }
   #content { margin-right: $sidebar-width-wide; }
   #content {
     > div, > article {

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

@@ -18,17 +18,29 @@ $solar-green:     #859900 !default;
 $solarized: dark !default;
 
 @if $solarized == light {
-  $base03: #fdf6e3;
-  $base02: #eee8d5;
-  $base01: #93a1a1;
-  $base00: #839496;
-  $base0:  #657b83;
-  $base1:  #586e75;
-  $base2:  #073642;
-  $base3:  #002b36;
+
+  $_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: $base02 !default;
+$pre-border: darken($base02, 5) !default;
 $pre-color: $base1 !default;
+
+

.themes/classic/sass/base/_theme.scss

@@ -1,4 +1,4 @@
-$noise-bg: image-url('noise.png') top left;
+$noise-bg: image-url('noise.png') top left !default;
 $img-border: inline-image('dotted-border.png');
 
 // Main Link Colors
@@ -23,6 +23,8 @@ $type-border: #ddd !default;
 
 /* Navigation */
 $nav-bg: #ccc !default;
+$nav-bg-front: image-url('noise.png') !default;
+$nav-bg-back: linear-gradient(lighten($nav-bg, 8), $nav-bg, darken($nav-bg, 11)) !default;
 $nav-color: darken($nav-bg, 38) !default;
 $nav-color-hover: darken($nav-color, 25) !default;
 $nav-placeholder: desaturate(darken($nav-bg, 10), 15) !default;
@@ -39,13 +41,15 @@ $sidebar-link-color-hover: $link-color-hover !default;
 $sidebar-link-color-active: $link-color-active !default;
 $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-border-hover: 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: #888 !default;
 $footer-bg: #ccc !default;
+$footer-bg-front: image-url('noise.png') !default;
+$footer-bg-back: linear-gradient(lighten($footer-bg, 8), $footer-bg, darken($footer-bg, 11)) !default;
 $footer-color: darken($footer-bg, 38) !default;
 $footer-color-hover: darken($footer-color, 10) !default;
 $footer-border-top: lighten($footer-bg, 15) !default;

.themes/classic/sass/base/_typography.scss

@@ -1,21 +1,30 @@
 $blockquote: $type-border !default;
-$mono: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace;
+$sans: "PT Sans", "Helvetica Neue", Arial, sans-serif !default;
+$serif: "PT Serif", Georgia, Times, "Times New Roman", serif !default;
+$mono: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace !default;
+$heading-font-family: "PT Serif", "Georgia", "Helvetica Neue", Arial, sans-serif !default;
+$header-title-font-family: $heading-font-family !default;
+$header-subtitle-font-family: $heading-font-family !default;
 
 // Fonts
 .heading {
-  font-family: "PT Serif", "Georgia", "Helvetica Neue", Arial, sans-serif;
+  font-family: $heading-font-family;
 }
-.sans { font-family: "PT Sans", "Helvetica Neue", Arial, sans-serif; }
-.serif { font-family: "PT Serif", Georgia, Times, "Times New Roman", serif; }
+.sans { font-family: $sans; }
+.serif { font-family: $serif; }
 .mono { font-family: $mono; }
 
 body > header h1 {
   font-size: 2.2em;
   @extend .heading;
+  font-family: $header-title-font-family;
   font-weight: normal;
   line-height: 1.2em;
   margin-bottom: 0.6667em;
 }
+body > header h2 {
+  font-family: $header-subtitle-font-family;
+}
 
 body {
   line-height: 1.5em;
@@ -56,12 +65,12 @@ h6, section h5, section section h4, section section section h3 {
 p, blockquote, ul, ol { margin-bottom: 1.5em; }
 
 ul { list-style-type: disc;
-  ul { list-style-type: circle;
-    ul { list-style-type: square; }}}
+  ul { list-style-type: circle; margin-bottom: 0px;
+    ul { list-style-type: square; margin-bottom: 0px; }}}
 
 ol { list-style-type: decimal;
-  ol { list-style-type: lower-alpha;
-    ol { list-style-type: lower-roman; }}}
+  ol { list-style-type: lower-alpha; margin-bottom: 0px;
+    ol { list-style-type: lower-roman; margin-bottom: 0px; }}}
 
 ul, ol { &, ul, ol { margin-left: 1.3em; }}
 
@@ -115,7 +124,8 @@ blockquote {
   }
 }
 
-.has-pullquote:before {
+.pullquote-right:before,
+.pullquote-left:before {
   /* Reset metrics. */
   padding: 0;
   border: none;
@@ -134,6 +144,13 @@ blockquote {
   font-size: 1.4em;
   line-height: 1.45em;
 }
+
+.pullquote-left:before {
+  /* Make left pullquotes align properly. */
+  float: left;
+  margin: .5em 1.5em 1em 0;
+}
+
 /* @extend this to force long lines of continuous text to wrap */
 .force-wrap {
   white-space: -moz-pre-wrap;

.themes/classic/sass/custom/_colors.scss

@@ -5,13 +5,18 @@
 //$header-bg: #263347;
 //$subtitle-color: lighten($header-bg, 58);
 //$nav-bg: desaturate(lighten(#8fc17a, 18), 5);
+//$nav-bg-front: image-url('noise.png');
+//$nav-bg-back: linear-gradient(lighten($nav-bg, 8), $nav-bg, darken($nav-bg, 11));
 //$sidebar-bg: desaturate(#eceff5, 8);
 //$sidebar-link-color: saturate(#526f9a, 10);
 //$sidebar-link-color-hover: darken(#7ab662, 9);
+//$footer-bg: #ccc !default;
+//$footer-bg-front: image-url('noise.png');
+//$footer-bg-back: linear-gradient(lighten($footer-bg, 8), $footer-bg, darken($footer-bg, 11));
 
 
 /* To use the light Solarized highlighting theme uncomment the following line */
-//$solarized: light
+//$solarized: light;
 
 /* If you want to tweak the Solarized colors you can do that here */
 //$base03:          #002b36; //darkest blue
@@ -34,5 +39,5 @@
 
 /* Non highlighted code colors */
 //$pre-bg: $base03;
-//$pre-border: $base02;
+//$pre-border: darken($base02, 5);
 //$pre-color: $base1;

.themes/classic/sass/custom/_fonts.scss

@@ -0,0 +1,10 @@
+// Here you can easily change font faces which are used in your site.
+// To give it a try, uncomment some of the lines below rebuild your blog, and see how it works. your sites's.
+// If you love to use Web Fonts, you also need to add some lines to source/_includes/custom/head.html
+
+//$sans: "Optima", sans-serif;
+//$serif: "Baskerville", serif;
+//$mono: "Courier", monospace;
+//$heading-font-family: "Verdana", sans-serif;
+//$header-title-font-family: "Futura", sans-serif;
+//$header-subtitle-font-family: "Futura", sans-serif;

.themes/classic/sass/custom/_layout.scss

@@ -1,6 +1,10 @@
 // Here you can easily change your sites's layout.
 // To give it a try, uncomment some of the lines below, make changes, rebuild your blog, and see how it works.
 
+//$header-font-size: 1em;
+//$header-padding-top: 1.5em;
+//$header-padding-bottom: 1.5em;
+
 //$max-width: 1350px;
 //$indented-lists: true;
 

.themes/classic/sass/partials/_blog.scss

@@ -1,5 +1,4 @@
 article {
-  overflow: hidden;
   padding-top: 1em;
   a { @extend .force-wrap; }
   header {
@@ -74,6 +73,8 @@ article {
     p.meta {
       margin-bottom: .8em;
       font-size: .85em;
+      clear: both;
+      overflow: hidden;
     }
     .byline + time:before, time +time:before, .comments:before, .byline ~ .categories:before {
       @extend .separator;
@@ -121,14 +122,12 @@ article + article {
   display: inline-block;
 }
 
-#content nav.pagination {
+#content div.pagination {
   text-align: center;
   font-size: .95em;
-  div {
-    position: relative;
-    background: $img-border top left repeat-x;
-    padding: {top: 1.5em; bottom: 1.5em;}
-  }
+  position: relative;
+  background: $img-border top left repeat-x;
+  padding: {top: 1.5em; bottom: 1.5em;}
   a {
     text-decoration: none;
     color: $text-color-light;

.themes/classic/sass/partials/_footer.scss

@@ -4,7 +4,7 @@ body > footer {
   color: $footer-color;
   text-shadow: lighten($footer-bg, 5) 0 1px;
   background-color: $footer-bg;
-  @include background(image-url('noise.png'), linear-gradient(lighten($footer-bg, 8), $footer-bg, darken($footer-bg, 11)));
+  @include background($footer-bg-front, $footer-bg-back);
   border-top: 1px solid $footer-border-top;
   position: relative;
   padding-top: 1em;

.themes/classic/sass/partials/_navigation.scss

@@ -1,7 +1,7 @@
 body > nav {
   position: relative;
   background-color: $nav-bg;
-  @include background(image-url('noise.png'), linear-gradient(lighten($nav-bg, 8), $nav-bg, darken($nav-bg, 11)));
+  @include background($nav-bg-front, $nav-bg-back);
   border: {
     top: 1px solid $nav-border-top;
     bottom: 1px solid $nav-border-bottom; }

.themes/classic/sass/partials/_sidebar.scss

@@ -1,4 +1,5 @@
 @import "sidebar/base";
 @import "sidebar/twitter";
+@import "sidebar/googleplus";
 @import "sidebar/pinboard";
 @import "sidebar/delicious";