GitList
Browse code

updated to latest version of Sass, fixed deprecation warnings

Brandon Mathis authored on 19/05/2012 at 19:48:37
Showing 3 changed files
.themes/classic/sass/base/_layout.scss
History View file @ d71223c
... ... 
@@ -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 149 
     }
150 150 
   }
151 151 
   aside.sidebar {
152 
-    @extend .group;
153 152 
     width: $sidebar-width-medium - $sidebar-pad-medium*2;
154 153 
     padding: 0 $sidebar-pad-medium $sidebar-pad-medium;
155 154 
     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 190 
     ul, ol { margin-left: 0; }
191 191 
   }
192 192 
 }
193 
+
.themes/classic/sass/partials/_navigation.scss
History View file @ d71223c
... ... 
@@ -13,7 +13,7 @@ body > nav {
13 13 
     .search {
14 14 
       padding: .3em .5em 0;
15 15 
       font-size: .85em;
16 
-      @extend .sans;
16 
+      font-family: $sans;
17 17 
       line-height: 1.1em;
18 18 
       width: 95%;
19 19 
       @include border-radius(.5em);
... ... 
@@ -54,7 +54,7 @@ body > nav {
54 54 
     }
55 55 
     a {
56 56 
       @include link-colors($nav-color, $nav-color-hover, $visited: $nav-color);
57 
-      @extend .sans;
57 
+      font-family: $sans;
58 58 
       text-shadow: lighten($nav-bg, 12) 0 1px;
59 59 
       float: left;
60 60 
       text-decoration: none;
... ... 
@@ -134,3 +134,4 @@ body > nav {
134 134 
   a[rel=subscribe-rss]{ @include mask-subscription-nav('rss.png'); }
135 135 
   a[rel=subscribe-email]{ @include mask-subscription-nav('email.png'); }
136 136 
 }
137 
+
Gemfile.lock
History View file @ d71223c
... ... 
@@ -39,7 +39,7 @@ GEM
39 39 
     rubypython (0.5.1)
40 40 
       blankslate (>= 2.1.2.3)
41 41 
       ffi (~> 1.0.7)
42 
-    sass (3.1.5)
42 
+    sass (3.1.18)
43 43 
     sinatra (1.2.6)
44 44 
       rack (~> 1.1)
45 45 
       tilt (>= 1.2.2, < 2.0)