moparisthebest/www.moparscape.org
1
0
Fork 0
mirror of https://github.com/moparisthebest/www.moparscape.org synced 2024-12-25 08:58:49 -05:00
Code Issues Releases Wiki Activity

updated to latest version of Sass, fixed deprecation warnings

Browse Source
This commit is contained in:
Brandon Mathis 2012-05-19 14:48:37 -05:00
parent 9f40242b1e
commit d71223c675
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.themes/classic/sass/base/_layout.scss
View File

@ -127,16 +127,17 @@ body.sidebar-footer {
@media only screen and (min-width: 750px) { @media only screen and (min-width: 750px) {
aside.sidebar { @include collapse-sidebar; } aside.sidebar { @include collapse-sidebar; }
} }
#main, #content, .sidebar {
@extend .group;
}
@media only screen and (min-width: 768px) { @media only screen and (min-width: 768px) {
body { -webkit-text-size-adjust: auto; } body { -webkit-text-size-adjust: auto; }
body > header { font-size: $header-font-size * 1.2; } body > header { font-size: $header-font-size * 1.2; }
#main { #main {
@extend .group;
padding: 0; padding: 0;
margin: 0 auto; margin: 0 auto;
} }
#content { #content {
@extend .group;
overflow: visible; overflow: visible;
margin-right: $sidebar-width-medium; margin-right: $sidebar-width-medium;
position: relative; position: relative;
@ -149,7 +150,6 @@ body.sidebar-footer {
} }
} }
aside.sidebar { aside.sidebar {
@extend .group;
width: $sidebar-width-medium - $sidebar-pad-medium*2; width: $sidebar-width-medium - $sidebar-pad-medium*2;
padding: 0 $sidebar-pad-medium $sidebar-pad-medium; padding: 0 $sidebar-pad-medium $sidebar-pad-medium;
background: none; background: none;
@ -180,7 +180,6 @@ body.sidebar-footer {
padding: 1.2em $sidebar-pad-wide $sidebar-pad-wide; padding: 1.2em $sidebar-pad-wide $sidebar-pad-wide;
.collapse-sidebar & { .collapse-sidebar & {
padding: { left: $pad-wide; right: $pad-wide; } padding: { left: $pad-wide; right: $pad-wide; }
@extend .group;
} }
} }
} }
@ -190,3 +189,4 @@ body.sidebar-footer {
ul, ol { margin-left: 0; } ul, ol { margin-left: 0; }
} }
} }

5
.themes/classic/sass/partials/_navigation.scss
View File

@ -13,7 +13,7 @@ body > nav {
.search { .search {
padding: .3em .5em 0; padding: .3em .5em 0;
font-size: .85em; font-size: .85em;
@extend .sans; font-family: $sans;
line-height: 1.1em; line-height: 1.1em;
width: 95%; width: 95%;
@include border-radius(.5em); @include border-radius(.5em);
@ -54,7 +54,7 @@ body > nav {
} }
a { a {
@include link-colors($nav-color, $nav-color-hover, $visited: $nav-color); @include link-colors($nav-color, $nav-color-hover, $visited: $nav-color);
@extend .sans; font-family: $sans;
text-shadow: lighten($nav-bg, 12) 0 1px; text-shadow: lighten($nav-bg, 12) 0 1px;
float: left; float: left;
text-decoration: none; text-decoration: none;
@ -134,3 +134,4 @@ body > nav {
a[rel=subscribe-rss]{ @include mask-subscription-nav('rss.png'); } a[rel=subscribe-rss]{ @include mask-subscription-nav('rss.png'); }
a[rel=subscribe-email]{ @include mask-subscription-nav('email.png'); } a[rel=subscribe-email]{ @include mask-subscription-nav('email.png'); }
} }

2
Gemfile.lock
View File

@ -39,7 +39,7 @@ GEM
rubypython (0.5.1) rubypython (0.5.1)
blankslate (>= 2.1.2.3) blankslate (>= 2.1.2.3)
ffi (~> 1.0.7) ffi (~> 1.0.7)
sass (3.1.5) sass (3.1.18)
sinatra (1.2.6) sinatra (1.2.6)
rack (~> 1.1) rack (~> 1.1)
tilt (>= 1.2.2, < 2.0) tilt (>= 1.2.2, < 2.0)