Merge pull request #35 from smt/pull-request-1

Updated Gemfile.lock and some deprecated Compass mixin args

4 files changed, 16 insertions, 10 deletions

diff --git a/.themes/classic/sass/base/_theme.scss b/.themes/classic/sass/base/_theme.scss
index 75ff8e7b..3953fe35 100644
--- a/.themes/classic/sass/base/_theme.scss
+++ b/.themes/classic/sass/base/_theme.scss
@@ -69,7 +69,7 @@ aside[role=sidebar] a {
   @include link-colors($sidebar-link-color, $hover: $sidebar-link-color-hover, $focus: $sidebar-link-color-hover, $active: $sidebar-link-color-active);
 }
 a {
-  @include transition(color, .3s);
+  @include transition(color .3s);
 }
 
 html {
diff --git a/.themes/classic/sass/partials/_blog.scss b/.themes/classic/sass/partials/_blog.scss
index ab9033f3..8894755c 100644
--- a/.themes/classic/sass/partials/_blog.scss
+++ b/.themes/classic/sass/partials/_blog.scss
@@ -108,7 +108,7 @@ article + article {
     text-decoration: none;
     color: mix($text-color, $text-color-light);
     @extend .serif;
-    @include transition(background-color, .5s);
+    @include transition(background-color .5s);
     &:hover {
       background: $link-color-hover;
       text-shadow: none;
diff --git a/.themes/classic/sass/partials/sidebar/_base.scss b/.themes/classic/sass/partials/sidebar/_base.scss
index 90ec7b69..3b238a9b 100644
--- a/.themes/classic/sass/partials/sidebar/_base.scss
+++ b/.themes/classic/sass/partials/sidebar/_base.scss
@@ -34,7 +34,7 @@ aside[role=sidebar] {
   }
   a {
     color: inherit;
-    @include transition(color, .5s);
+    @include transition(color .5s);
   }
   &:hover a {
     color: $sidebar-link-color;
diff --git a/Gemfile.lock b/Gemfile.lock
index b103020e..302cc44c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,31 +2,37 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.7)
+    albino (1.3.3)
+      posix-spawn (>= 0.3.6)
     chunky_png (1.2.0)
     classifier (1.3.3)
       fast-stemmer (>= 1.0.0)
-    compass (0.11.3)
+    compass (0.11.5)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
     directory_watcher (1.4.0)
     fast-stemmer (1.0.0)
     fssm (0.2.7)
-    haml (3.1.1)
-    jekyll (0.10.0)
+    haml (3.1.2)
+    jekyll (0.11.0)
+      albino (>= 1.3.2)
       classifier (>= 1.3.1)
       directory_watcher (>= 1.1.1)
+      kramdown (>= 0.13.2)
       liquid (>= 1.9.0)
       maruku (>= 0.5.9)
+    kramdown (0.13.3)
     liquid (2.2.2)
     maruku (0.6.0)
       syntax (>= 1.0.0)
-    rack (1.3.0)
-    rake (0.9.0)
-    rb-fsevent (0.4.0)
+    posix-spawn (0.3.6)
+    rack (1.3.1)
+    rake (0.9.2)
+    rb-fsevent (0.4.1)
     rdiscount (1.6.8)
     rubypants (0.2.0)
-    sass (3.1.2)
+    sass (3.1.4)
     syntax (1.0.0)
 
 PLATFORMS