diff options
| author | Brandon Mathis <brandon@imathis.com> | 2012-05-19 14:48:37 -0500 |
|---|---|---|
| committer | Brandon Mathis <brandon@imathis.com> | 2012-05-19 14:48:37 -0500 |
| commit | d71223c675a4c2b0230dee49a941d5e678370b07 (patch) | |
| tree | 808bb754ddfe1d3528b512f91352a471219eba87 | |
| parent | 9f40242b1e7eb0098f0ef3c508c7bed7e647b982 (diff) | |
| download | my_new_personal_website-d71223c675a4c2b0230dee49a941d5e678370b07.tar.xz my_new_personal_website-d71223c675a4c2b0230dee49a941d5e678370b07.zip | |
updated to latest version of Sass, fixed deprecation warnings
| -rw-r--r-- | .themes/classic/sass/base/_layout.scss | 8 | ||||
| -rw-r--r-- | .themes/classic/sass/partials/_navigation.scss | 5 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/.themes/classic/sass/base/_layout.scss b/.themes/classic/sass/base/_layout.scss index ad99c6a2..81903428 100644 --- a/.themes/classic/sass/base/_layout.scss +++ b/.themes/classic/sass/base/_layout.scss @@ -127,16 +127,17 @@ body.sidebar-footer { @media only screen and (min-width: 750px) { aside.sidebar { @include collapse-sidebar; } } +#main, #content, .sidebar { + @extend .group; +} @media only screen and (min-width: 768px) { body { -webkit-text-size-adjust: auto; } body > header { font-size: $header-font-size * 1.2; } #main { - @extend .group; padding: 0; margin: 0 auto; } #content { - @extend .group; overflow: visible; margin-right: $sidebar-width-medium; position: relative; @@ -149,7 +150,6 @@ body.sidebar-footer { } } aside.sidebar { - @extend .group; width: $sidebar-width-medium - $sidebar-pad-medium*2; padding: 0 $sidebar-pad-medium $sidebar-pad-medium; background: none; @@ -180,7 +180,6 @@ body.sidebar-footer { padding: 1.2em $sidebar-pad-wide $sidebar-pad-wide; .collapse-sidebar & { padding: { left: $pad-wide; right: $pad-wide; } - @extend .group; } } } @@ -190,3 +189,4 @@ body.sidebar-footer { ul, ol { margin-left: 0; } } } + diff --git a/.themes/classic/sass/partials/_navigation.scss b/.themes/classic/sass/partials/_navigation.scss index 68a15ce0..30fa011d 100644 --- a/.themes/classic/sass/partials/_navigation.scss +++ b/.themes/classic/sass/partials/_navigation.scss @@ -13,7 +13,7 @@ body > nav { .search { padding: .3em .5em 0; font-size: .85em; - @extend .sans; + font-family: $sans; line-height: 1.1em; width: 95%; @include border-radius(.5em); @@ -54,7 +54,7 @@ body > nav { } a { @include link-colors($nav-color, $nav-color-hover, $visited: $nav-color); - @extend .sans; + font-family: $sans; text-shadow: lighten($nav-bg, 12) 0 1px; float: left; text-decoration: none; @@ -134,3 +134,4 @@ body > nav { a[rel=subscribe-rss]{ @include mask-subscription-nav('rss.png'); } a[rel=subscribe-email]{ @include mask-subscription-nav('email.png'); } } + diff --git a/Gemfile.lock b/Gemfile.lock index 63506982..c7278fa3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,7 +39,7 @@ GEM rubypython (0.5.1) blankslate (>= 2.1.2.3) ffi (~> 1.0.7) - sass (3.1.5) + sass (3.1.18) sinatra (1.2.6) rack (~> 1.1) tilt (>= 1.2.2, < 2.0) |