updated to latest version of Sass, fixed deprecation warnings

imathis · imathis · commit d71223c675a4 · 2012-05-19T14:48:37.000-05:00
diff --git 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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -127,16 +127,17 @@ body.sidebar-footer {`
`127`	`127`	`@media only screen and (min-width: 750px) {`
`128`	`128`	`aside.sidebar { @include collapse-sidebar; }`
`129`	`129`	`}`
	`130`	`+#main, #content, .sidebar {`
	`131`	`+ @extend .group;`
	`132`	`+}`
`130`	`133`	`@media only screen and (min-width: 768px) {`
`131`	`134`	`body { -webkit-text-size-adjust: auto; }`
`132`	`135`	`body > header { font-size: $header-font-size * 1.2; }`
`133`	`136`	`#main {`
`134`		`- @extend .group;`
`135`	`137`	`padding: 0;`
`136`	`138`	`margin: 0 auto;`
`137`	`139`	`}`
`138`	`140`	`#content {`
`139`		`- @extend .group;`
`140`	`141`	`overflow: visible;`
`141`	`142`	`margin-right: $sidebar-width-medium;`
`142`	`143`	`position: relative;`
`@@ -149,7 +150,6 @@ body.sidebar-footer {`
`149`	`150`	`}`
`150`	`151`	`}`
`151`	`152`	`aside.sidebar {`
`152`		`- @extend .group;`
`153`	`153`	`width: $sidebar-width-medium - $sidebar-pad-medium*2;`
`154`	`154`	`padding: 0 $sidebar-pad-medium $sidebar-pad-medium;`
`155`	`155`	`background: none;`
`@@ -180,7 +180,6 @@ body.sidebar-footer {`
`180`	`180`	`padding: 1.2em $sidebar-pad-wide $sidebar-pad-wide;`
`181`	`181`	`.collapse-sidebar & {`
`182`	`182`	`padding: { left: $pad-wide; right: $pad-wide; }`
`183`		`- @extend .group;`
`184`	`183`	`}`
`185`	`184`	`}`
`186`	`185`	`}`
`@@ -190,3 +189,4 @@ body.sidebar-footer {`
`190`	`189`	`ul, ol { margin-left: 0; }`
`191`	`190`	`}`
`192`	`191`	`}`
	`192`	`+`