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

Updated Gemfile.lock and some deprecated Compass mixin args
This commit is contained in:
Brandon Mathis 2011-07-16 19:46:55 -07:00
commit ed17a8a927
4 changed files with 16 additions and 10 deletions

View File

@ -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); @include link-colors($sidebar-link-color, $hover: $sidebar-link-color-hover, $focus: $sidebar-link-color-hover, $active: $sidebar-link-color-active);
} }
a { a {
@include transition(color, .3s); @include transition(color .3s);
} }
html { html {

View File

@ -108,7 +108,7 @@ article + article {
text-decoration: none; text-decoration: none;
color: mix($text-color, $text-color-light); color: mix($text-color, $text-color-light);
@extend .serif; @extend .serif;
@include transition(background-color, .5s); @include transition(background-color .5s);
&:hover { &:hover {
background: $link-color-hover; background: $link-color-hover;
text-shadow: none; text-shadow: none;

View File

@ -34,7 +34,7 @@ aside[role=sidebar] {
} }
a { a {
color: inherit; color: inherit;
@include transition(color, .5s); @include transition(color .5s);
} }
&:hover a { &:hover a {
color: $sidebar-link-color; color: $sidebar-link-color;

View File

@ -2,31 +2,37 @@ GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
RedCloth (4.2.7) RedCloth (4.2.7)
albino (1.3.3)
posix-spawn (>= 0.3.6)
chunky_png (1.2.0) chunky_png (1.2.0)
classifier (1.3.3) classifier (1.3.3)
fast-stemmer (>= 1.0.0) fast-stemmer (>= 1.0.0)
compass (0.11.3) compass (0.11.5)
chunky_png (~> 1.2) chunky_png (~> 1.2)
fssm (>= 0.2.7) fssm (>= 0.2.7)
sass (~> 3.1) sass (~> 3.1)
directory_watcher (1.4.0) directory_watcher (1.4.0)
fast-stemmer (1.0.0) fast-stemmer (1.0.0)
fssm (0.2.7) fssm (0.2.7)
haml (3.1.1) haml (3.1.2)
jekyll (0.10.0) jekyll (0.11.0)
albino (>= 1.3.2)
classifier (>= 1.3.1) classifier (>= 1.3.1)
directory_watcher (>= 1.1.1) directory_watcher (>= 1.1.1)
kramdown (>= 0.13.2)
liquid (>= 1.9.0) liquid (>= 1.9.0)
maruku (>= 0.5.9) maruku (>= 0.5.9)
kramdown (0.13.3)
liquid (2.2.2) liquid (2.2.2)
maruku (0.6.0) maruku (0.6.0)
syntax (>= 1.0.0) syntax (>= 1.0.0)
rack (1.3.0) posix-spawn (0.3.6)
rake (0.9.0) rack (1.3.1)
rb-fsevent (0.4.0) rake (0.9.2)
rb-fsevent (0.4.1)
rdiscount (1.6.8) rdiscount (1.6.8)
rubypants (0.2.0) rubypants (0.2.0)
sass (3.1.2) sass (3.1.4)
syntax (1.0.0) syntax (1.0.0)
PLATFORMS PLATFORMS