GitList
Browse code

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

Updated Gemfile.lock and some deprecated Compass mixin args

Brandon Mathis authored on 17/07/2011 at 02:46:55
Showing 4 changed files
.themes/classic/sass/base/_theme.scss
History View file @ ed17a8a
... ... 
@@ -69,7 +69,7 @@ aside[role=sidebar] a {
69 69 
   @include link-colors($sidebar-link-color, $hover: $sidebar-link-color-hover, $focus: $sidebar-link-color-hover, $active: $sidebar-link-color-active);
70 70 
 }
71 71 
 a {
72 
-  @include transition(color, .3s);
72 
+  @include transition(color .3s);
73 73 
 }
74 74
75 75 
 html {
.themes/classic/sass/partials/_blog.scss
History View file @ ed17a8a
... ... 
@@ -108,7 +108,7 @@ article + article {
108 108 
     text-decoration: none;
109 109 
     color: mix($text-color, $text-color-light);
110 110 
     @extend .serif;
111 
-    @include transition(background-color, .5s);
111 
+    @include transition(background-color .5s);
112 112 
     &:hover {
113 113 
       background: $link-color-hover;
114 114 
       text-shadow: none;
.themes/classic/sass/partials/sidebar/_base.scss
History View file @ ed17a8a
... ... 
@@ -34,7 +34,7 @@ aside[role=sidebar] {
34 34 
   }
35 35 
   a {
36 36 
     color: inherit;
37 
-    @include transition(color, .5s);
37 
+    @include transition(color .5s);
38 38 
   }
39 39 
   &:hover a {
40 40 
     color: $sidebar-link-color;
Gemfile.lock
History View file @ ed17a8a
... ... 
@@ -2,31 +2,37 @@ GEM
2 2 
   remote: http://rubygems.org/
3 3 
   specs:
4 4 
     RedCloth (4.2.7)
5 
+    albino (1.3.3)
6 
+      posix-spawn (>= 0.3.6)
5 7 
     chunky_png (1.2.0)
6 8 
     classifier (1.3.3)
7 9 
       fast-stemmer (>= 1.0.0)
8 
-    compass (0.11.3)
10 
+    compass (0.11.5)
9 11 
       chunky_png (~> 1.2)
10 12 
       fssm (>= 0.2.7)
11 13 
       sass (~> 3.1)
12 14 
     directory_watcher (1.4.0)
13 15 
     fast-stemmer (1.0.0)
14 16 
     fssm (0.2.7)
15 
-    haml (3.1.1)
16 
-    jekyll (0.10.0)
17 
+    haml (3.1.2)
18 
+    jekyll (0.11.0)
19 
+      albino (>= 1.3.2)
17 20 
       classifier (>= 1.3.1)
18 21 
       directory_watcher (>= 1.1.1)
22 
+      kramdown (>= 0.13.2)
19 23 
       liquid (>= 1.9.0)
20 24 
       maruku (>= 0.5.9)
25 
+    kramdown (0.13.3)
21 26 
     liquid (2.2.2)
22 27 
     maruku (0.6.0)
23 28 
       syntax (>= 1.0.0)
24 
-    rack (1.3.0)
25 
-    rake (0.9.0)
26 
-    rb-fsevent (0.4.0)
29 
+    posix-spawn (0.3.6)
30 
+    rack (1.3.1)
31 
+    rake (0.9.2)
32 
+    rb-fsevent (0.4.1)
27 33 
     rdiscount (1.6.8)
28 34 
     rubypants (0.2.0)
29 
-    sass (3.1.2)
35 
+    sass (3.1.4)
30 36 
     syntax (1.0.0)
31 37
32 38 
 PLATFORMS