aboutsummaryrefslogtreecommitdiff
path: root/.themes
diff options
context:
space:
mode:
authorBrandon Mathis <brandon@imathis.com>2011-07-16 19:46:55 -0700
committerBrandon Mathis <brandon@imathis.com>2011-07-16 19:46:55 -0700
commited17a8a9276cc9aab3410105b9f4d902ede6e45f (patch)
tree5ffe2ec8e8035f8f02dbd5e6961c5a18d36614e4 /.themes
parent575ad6d6a1d9a78485659c5cef7bed9fb3401e19 (diff)
parent31b578b06704e0d7234bdebb5c4b84d80dd1b54e (diff)
downloadmy_new_personal_website-ed17a8a9276cc9aab3410105b9f4d902ede6e45f.tar.xz
my_new_personal_website-ed17a8a9276cc9aab3410105b9f4d902ede6e45f.zip
Merge pull request #35 from smt/pull-request-1
Updated Gemfile.lock and some deprecated Compass mixin args
Diffstat (limited to '')
-rw-r--r--.themes/classic/sass/base/_theme.scss2
-rw-r--r--.themes/classic/sass/partials/_blog.scss2
-rw-r--r--.themes/classic/sass/partials/sidebar/_base.scss2
3 files changed, 3 insertions, 3 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;