diff --git a/.sass-cache/21994e5998254a2f4b4a20080dd2af85c72ade8e/application.css.scssc b/.sass-cache/21994e5998254a2f4b4a20080dd2af85c72ade8e/application.css.scssc index 9be0aa7..c464769 100644 Binary files a/.sass-cache/21994e5998254a2f4b4a20080dd2af85c72ade8e/application.css.scssc and b/.sass-cache/21994e5998254a2f4b4a20080dd2af85c72ade8e/application.css.scssc differ diff --git a/assets/stylesheets/application.css.scss b/assets/stylesheets/application.css.scss index a9a2c79..1910088 100644 --- a/assets/stylesheets/application.css.scss +++ b/assets/stylesheets/application.css.scss @@ -67,6 +67,7 @@ h1, h2, h3, li, p { .highlight { @extend .rounded; + background-color : $code-background; width : 90%; margin : 0 auto; @@ -121,6 +122,7 @@ h1, h2, h3, li, p { code { @extend .rounded; + background-color : $code-background; font-size : 90%; font-weight : bold; @@ -145,10 +147,11 @@ h1, h2, h3, li, p { } .grid { + @include grid-background(16, 20px, 10px, 20px, 5px, $force-fluid: true); + background-color : $code-background; margin : 0 auto; height : 500px; width : 700px; - @include grid-background(16, 20px, 10px, 20px, 5px, $force-fluid: true); } diff --git a/presentation/07_inheiritance.slides b/presentation/07_inheiritance.slides index 9f5b79d..8af07f4 100644 --- a/presentation/07_inheiritance.slides +++ b/presentation/07_inheiritance.slides @@ -29,4 +29,23 @@ ``` !SLIDE -# And slow \ No newline at end of file +# And slow + +!SLIDE + +## Selector layout + +``` scss +.release_title a{ + @extend h3; + @include adjust-font-size-to(20px, 1); + @include trailer; + + text-decoration : none; + display : block; + + &:hover { + color:$hover-color; + } +} +``` \ No newline at end of file diff --git a/presentation/08_compass.slides b/presentation/08_compass.slides index 7d4df4c..3bb6b2d 100644 --- a/presentation/08_compass.slides +++ b/presentation/08_compass.slides @@ -1,5 +1,6 @@ !SLIDE # Compass +## http://compass-style.org !SLIDE @@ -142,4 +143,32 @@ a:active, a.glossy_active, a.glossy-active {
+!SLIDE + +## We need help! +https://github.com/chriseppstein/compass + +* Documentation +* Stylesheet cleanup +* Code Refactoring + +!SLIDE +## Core Team + +* Chris Eppstein +* Scott Davis (me) +* Brandon Mathis +* Eirc Myer (The other one) +* Anthony Short (newest member) + +!SLIDE + +# Charity +### United Mitochondrial Disease Foundation +### Please donate - http://umdf.org/compass + + + + +