Fix compass/sass deprecation warnings

This commit is contained in:
dbloete 2010-05-26 04:58:11 +08:00 committed by Brandon Mathis
parent 86f6a800d0
commit e112b7e05f
9 changed files with 67 additions and 67 deletions

View File

@ -88,7 +88,7 @@ end
desc "Generate styles only" desc "Generate styles only"
task :generate_style do task :generate_style do
puts ">>> Generating styles <<<" puts ">>> Generating styles <<<"
system "compass" system "compass compile"
end end
desc "Generate site files only" desc "Generate site files only"

View File

@ -1,3 +1,3 @@
//compass default reset //compass default reset
+global-reset +global-reset
@import compass/utilities.sass @import "compass/utilities"

View File

@ -2,7 +2,7 @@
!page_width = 980px !page_width = 980px
!sidebar_margin = 20px !sidebar_margin = 20px
!sidebar_width = 280px !sidebar_width = 280px
!default_border_radius = 4px $default_border_radius = 4px
html body html body
background-color: #{!body_bg} background-color: #{!body_bg}

View File

@ -1,7 +1,7 @@
@import compass/utilities @import "compass/utilities"
@import compass/css3 @import "compass/css3"
@import library/reset.sass @import "library/reset"
@import library/list_borders.sass @import "library/list_borders"
@import library/typography.sass @import "library/typography"
@import library/link_colors.sass @import "library/link_colors"

View File

@ -1,47 +1,47 @@
// Link Colors // Link Colors
!link_color = lighten(#165B94, .30) $link_color: lighten(#165B94, .30)
// Main Section Colors // Main Section Colors
!body_color = #333 $body_color: #333
!light_text = #999 $light_text: #999
!body_bg = #323232 $body_bg: #323232
!header_bg = #323232 $header_bg: #323232
!header_border = #181818 $header_border: #181818
!title_color = #ddd $title_color: #ddd
!nav_color = #555 $nav_color: #555
!nav_color_hover = #000 $nav_color_hover: #000
!nav_bg = #e8e8e8 $nav_bg: #e8e8e8
!nav_border_top = #fff $nav_border_top: #fff
!nav_border_bottom = #aaa $nav_border_bottom: #aaa
!nav_border_left = #ccc $nav_border_left: #ccc
!nav_border_right = #fff $nav_border_right: #fff
!page_border_sides = #ccc $page_border_sides: #ccc
!page_bg = #f0f0f0 $page_bg: #f0f0f0
!sidebar_bg = #fcfcfc $sidebar_bg: #fcfcfc
!sidebar_border = #eee $sidebar_border: #eee
// Blog // Blog
!article_border = #eee $article_border: #eee
!main_bg = #fff $main_bg: #fff
!footer_color = #999 $footer_color: #999
!footer_bg = #444 $footer_bg: #444
// Form Colors // Form Colors
!fieldset_bg = #ececec $fieldset_bg: #ececec
!fieldset_border = #c3c3c3 $fieldset_border: #c3c3c3
!textinput_color = #333 $textinput_color: #333
!textinput_bg = #f4f4f4 $textinput_bg: #f4f4f4
!textinput_bg_focus = #fefeee $textinput_bg_focus: #fefeee
!textinput_border_top = #aaa $textinput_border_top: #aaa
!textinput_border_bottom = #c6c6c6 $textinput_border_bottom: #c6c6c6
!textinput_border_left = #c3c3c3 $textinput_border_left: #c3c3c3
!textinput_border_right = #c3c3c3 $textinput_border_right: #c3c3c3
!textinput_border_focus = #989898 $textinput_border_focus: #989898
!twitter_topic = #888 $twitter_topic: #888

View File

@ -1,7 +1,7 @@
!base_font_size = 16px !base_font_size = 16px
!base_font_size_small = 13px !base_font_size_small = 13px
!base_font_color = #333 !base_font_color = #333
!default_border_radius = 6px $default_border_radius = 6px
+general-typography +general-typography
=heading-font =heading-font

View File

@ -1,24 +1,24 @@
!default_link_color ||= #165B94 $default_link_color: #165B94 !default
!default_link_color_hover ||= #fff $default_link_color_hover: #fff !default
!default_link_color_alt ||= #91D5F1 $default_link_color_alt: #91D5F1 !default
!default_link_color_hover_alt ||= #000 $default_link_color_hover_alt: #000 !default
=link-color(!hover = true) =link-color($hover: true)
+link-color-style(!default_link_color, !default_link_color_hover, !default_link_color, !hover) +link-color-style($default_link_color, $default_link_color_hover, $default_link_color, $hover)
=link-color-alt(!hover = true) =link-color-alt($hover: true)
+link-color-style(!default_link_color_alt, !default_link_color_hover_alt, !default_link_color_alt, !hover) +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-heading($link_color: "inherit", $hover_bg_color: #ccc)
+link-color-style(!link_color,) +link-color-style($link_color)
=link-color-style(!color = !default_link_color, !color_hover = !default_link_color_hover, !link_hover_bg = !color, !hover = true) =link-color-style($color: $default_link_color, $color_hover: $default_link_color_hover, $link_hover_bg: $color, $hover: true)
color= !color color: $color
padding: 2px padding: 2px
margin: 0 -2px margin: 0 -2px
+border-radius(3px) +border-radius(3px)
@if !hover @if $hover
&:hover &:hover
background-color= !link_hover_bg background-color: $link_hover_bg
color= !color_hover color: $color_hover
text-decoration: none text-decoration: none

View File

@ -1,11 +1,11 @@
#header #header
background-color: {!header_bg} background-color: $header_bg
border-bottom: 1px solid #{!header_border} border-bottom: 1px solid #{$header_border}
padding: 25px 0 padding: 25px 0
h1 h1
display: inline-block display: inline-block
margin: 0 margin: 0
a.title a.title
font-weight: normal font-weight: normal
color: #{!title_color} color: #{$title_color}
text-decoration: none text-decoration: none

View File

@ -1,11 +1,11 @@
/* SASS mixins */ /* SASS mixins */
@import library.sass @import "library"
/* primary SASS */ /* primary SASS */
@import base.sass @import "base"
@import theme.sass @import "theme"
@import typography.sass @import "typography"
@import layout.sass @import "layout"
/* specific SASS */ /* specific SASS */
@import partials.sass @import "partials"