Fix compass/sass deprecation warnings

9 files changed, 70 insertions, 70 deletions

diff --git a/Rakefile b/Rakefile
index 1ee4153a..ad6973dd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -88,7 +88,7 @@ end
 desc "Generate styles only"
 task :generate_style do
   puts ">>> Generating styles <<<"
-  system "compass"
+  system "compass compile"
 end
 
 desc "Generate site files only"
diff --git a/stylesheets/_base.sass b/stylesheets/_base.sass
index 82b34b76..ef6ccaf0 100644
--- a/stylesheets/_base.sass
+++ b/stylesheets/_base.sass
@@ -1,3 +1,3 @@
 //compass default reset
 +global-reset
-@import compass/utilities.sass
\ No newline at end of file
+@import "compass/utilities"
\ No newline at end of file
diff --git a/stylesheets/_layout.sass b/stylesheets/_layout.sass
index 4acb0dc4..def1c7ac 100644
--- a/stylesheets/_layout.sass
+++ b/stylesheets/_layout.sass
@@ -2,7 +2,7 @@
 !page_width = 980px
 !sidebar_margin = 20px
 !sidebar_width = 280px
-!default_border_radius = 4px
+$default_border_radius = 4px
 
 html body
   background-color: #{!body_bg}
diff --git a/stylesheets/_library.sass b/stylesheets/_library.sass
index 3861722d..b2767005 100644
--- a/stylesheets/_library.sass
+++ b/stylesheets/_library.sass
@@ -1,7 +1,7 @@
-@import compass/utilities
-@import compass/css3
+@import "compass/utilities"
+@import "compass/css3"
 
-@import library/reset.sass
-@import library/list_borders.sass
-@import library/typography.sass
-@import library/link_colors.sass
\ No newline at end of file
+@import "library/reset"
+@import "library/list_borders"
+@import "library/typography"
+@import "library/link_colors"
\ No newline at end of file
diff --git a/stylesheets/_theme.sass b/stylesheets/_theme.sass
index 5b87b612..15ed412f 100644
--- a/stylesheets/_theme.sass
+++ b/stylesheets/_theme.sass
@@ -1,47 +1,47 @@
 // Link Colors
-!link_color = lighten(#165B94, .30)
+$link_color: lighten(#165B94, .30)
 
 // Main Section Colors
-!body_color = #333
-!light_text = #999
-!body_bg = #323232
-
-!header_bg = #323232
-!header_border = #181818
-!title_color = #ddd
-
-!nav_color = #555
-!nav_color_hover = #000
-!nav_bg = #e8e8e8
-!nav_border_top = #fff
-!nav_border_bottom = #aaa
-!nav_border_left = #ccc
-!nav_border_right = #fff
-
-!page_border_sides = #ccc
-!page_bg = #f0f0f0
-!sidebar_bg = #fcfcfc
-!sidebar_border = #eee
+$body_color: #333
+$light_text: #999
+$body_bg: #323232
+
+$header_bg: #323232
+$header_border: #181818
+$title_color: #ddd
+
+$nav_color: #555
+$nav_color_hover: #000
+$nav_bg: #e8e8e8
+$nav_border_top: #fff
+$nav_border_bottom: #aaa
+$nav_border_left: #ccc
+$nav_border_right: #fff
+
+$page_border_sides: #ccc
+$page_bg: #f0f0f0
+$sidebar_bg: #fcfcfc
+$sidebar_border: #eee
 
 // Blog 
-!article_border = #eee
-!main_bg = #fff
+$article_border: #eee
+$main_bg: #fff
 
-!footer_color = #999
-!footer_bg = #444
+$footer_color: #999
+$footer_bg: #444
 
 // Form Colors
-!fieldset_bg = #ececec
-!fieldset_border = #c3c3c3
+$fieldset_bg: #ececec
+$fieldset_border: #c3c3c3
 
-!textinput_color = #333
-!textinput_bg = #f4f4f4
-!textinput_bg_focus = #fefeee
+$textinput_color: #333
+$textinput_bg: #f4f4f4
+$textinput_bg_focus: #fefeee
 
-!textinput_border_top = #aaa
-!textinput_border_bottom = #c6c6c6
-!textinput_border_left = #c3c3c3
-!textinput_border_right = #c3c3c3
-!textinput_border_focus = #989898
+$textinput_border_top: #aaa
+$textinput_border_bottom: #c6c6c6
+$textinput_border_left: #c3c3c3
+$textinput_border_right: #c3c3c3
+$textinput_border_focus: #989898
 
-!twitter_topic = #888
\ No newline at end of file
+$twitter_topic: #888
\ No newline at end of file
diff --git a/stylesheets/_typography.sass b/stylesheets/_typography.sass
index 4d8ba95e..7e03bdd2 100644
--- a/stylesheets/_typography.sass
+++ b/stylesheets/_typography.sass
@@ -1,7 +1,7 @@
 !base_font_size = 16px
 !base_font_size_small = 13px
 !base_font_color = #333
-!default_border_radius = 6px
+$default_border_radius = 6px
 
 +general-typography
 =heading-font
diff --git a/stylesheets/library/_link_colors.sass b/stylesheets/library/_link_colors.sass
index 546c436e..648fc1e2 100644
--- a/stylesheets/library/_link_colors.sass
+++ b/stylesheets/library/_link_colors.sass
@@ -1,24 +1,24 @@
-!default_link_color           ||= #165B94
-!default_link_color_hover     ||= #fff
-!default_link_color_alt       ||= #91D5F1
-!default_link_color_hover_alt ||= #000
+$default_link_color:           #165B94 !default
+$default_link_color_hover:     #fff !default
+$default_link_color_alt:       #91D5F1 !default
+$default_link_color_hover_alt: #000 !default
 
-=link-color(!hover = true)
-  +link-color-style(!default_link_color, !default_link_color_hover, !default_link_color, !hover)
+=link-color($hover: true)
+  +link-color-style($default_link_color, $default_link_color_hover, $default_link_color, $hover)
 
-=link-color-alt(!hover = true)
-  +link-color-style(!default_link_color_alt, !default_link_color_hover_alt, !default_link_color_alt, !hover)
+=link-color-alt($hover: true)
+  +link-color-style($default_link_color_alt, $default_link_color_hover_alt, $default_link_color_alt, $hover)
   
-=link-color-heading(!link_color = "inherit", !hover_bg_color = #ccc)
-  +link-color-style(!link_color,)
+=link-color-heading($link_color: "inherit", $hover_bg_color: #ccc)
+  +link-color-style($link_color)
 
-=link-color-style(!color = !default_link_color, !color_hover = !default_link_color_hover, !link_hover_bg = !color, !hover = true)
-  color= !color
+=link-color-style($color: $default_link_color, $color_hover: $default_link_color_hover, $link_hover_bg: $color, $hover: true)
+  color: $color
   padding: 2px
   margin: 0 -2px
   +border-radius(3px)
-  @if !hover
+  @if $hover
     &:hover
-      background-color= !link_hover_bg
-      color= !color_hover
+      background-color: $link_hover_bg
+      color: $color_hover
       text-decoration: none
\ No newline at end of file
diff --git a/stylesheets/partials/_header.sass b/stylesheets/partials/_header.sass
index 2c70ba62..23e4b0b3 100644
--- a/stylesheets/partials/_header.sass
+++ b/stylesheets/partials/_header.sass
@@ -1,11 +1,11 @@
 #header
-  background-color: {!header_bg}
-  border-bottom: 1px solid #{!header_border}
+  background-color: $header_bg
+  border-bottom: 1px solid #{$header_border}
   padding: 25px 0
   h1
     display: inline-block
     margin: 0
     a.title
       font-weight: normal
-      color: #{!title_color}
+      color: #{$title_color}
       text-decoration: none
\ No newline at end of file
diff --git a/stylesheets/screen.sass b/stylesheets/screen.sass
index e7fcb538..3248ed0b 100644
--- a/stylesheets/screen.sass
+++ b/stylesheets/screen.sass
@@ -1,11 +1,11 @@
 /* SASS mixins */
-@import library.sass
+@import "library"
 
 /* primary SASS */
-@import base.sass
-@import theme.sass
-@import typography.sass
-@import layout.sass
+@import "base"
+@import "theme"
+@import "typography"
+@import "layout"
 
 /* specific SASS */
-@import partials.sass
\ No newline at end of file
+@import "partials"
\ No newline at end of file