Browse code

Fix compass/sass deprecation warnings

dbloete authored on 25/05/2010 at 20:58:11
Showing 9 changed files
... ...
@@ -88,7 +88,7 @@ end
88 88
 desc "Generate styles only"
89 89
 task :generate_style do
90 90
   puts ">>> Generating styles <<<"
91
-  system "compass"
91
+  system "compass compile"
92 92
 end
93 93
 
94 94
 desc "Generate site files only"
... ...
@@ -1,3 +1,3 @@
1 1
 //compass default reset
2 2
 +global-reset
3
-@import compass/utilities.sass
4 3
\ No newline at end of file
4
+@import "compass/utilities"
5 5
\ No newline at end of file
... ...
@@ -2,7 +2,7 @@
2 2
 !page_width = 980px
3 3
 !sidebar_margin = 20px
4 4
 !sidebar_width = 280px
5
-!default_border_radius = 4px
5
+$default_border_radius = 4px
6 6
 
7 7
 html body
8 8
   background-color: #{!body_bg}
... ...
@@ -1,7 +1,7 @@
1
-@import compass/utilities
2
-@import compass/css3
1
+@import "compass/utilities"
2
+@import "compass/css3"
3 3
 
4
-@import library/reset.sass
5
-@import library/list_borders.sass
6
-@import library/typography.sass
7
-@import library/link_colors.sass
8 4
\ No newline at end of file
5
+@import "library/reset"
6
+@import "library/list_borders"
7
+@import "library/typography"
8
+@import "library/link_colors"
9 9
\ No newline at end of file
... ...
@@ -1,47 +1,47 @@
1 1
 // Link Colors
2
-!link_color = lighten(#165B94, .30)
2
+$link_color: lighten(#165B94, .30)
3 3
 
4 4
 // Main Section Colors
5
-!body_color = #333
6
-!light_text = #999
7
-!body_bg = #323232
8
-
9
-!header_bg = #323232
10
-!header_border = #181818
11
-!title_color = #ddd
12
-
13
-!nav_color = #555
14
-!nav_color_hover = #000
15
-!nav_bg = #e8e8e8
16
-!nav_border_top = #fff
17
-!nav_border_bottom = #aaa
18
-!nav_border_left = #ccc
19
-!nav_border_right = #fff
20
-
21
-!page_border_sides = #ccc
22
-!page_bg = #f0f0f0
23
-!sidebar_bg = #fcfcfc
24
-!sidebar_border = #eee
5
+$body_color: #333
6
+$light_text: #999
7
+$body_bg: #323232
8
+
9
+$header_bg: #323232
10
+$header_border: #181818
11
+$title_color: #ddd
12
+
13
+$nav_color: #555
14
+$nav_color_hover: #000
15
+$nav_bg: #e8e8e8
16
+$nav_border_top: #fff
17
+$nav_border_bottom: #aaa
18
+$nav_border_left: #ccc
19
+$nav_border_right: #fff
20
+
21
+$page_border_sides: #ccc
22
+$page_bg: #f0f0f0
23
+$sidebar_bg: #fcfcfc
24
+$sidebar_border: #eee
25 25
 
26 26
 // Blog 
27
-!article_border = #eee
28
-!main_bg = #fff
27
+$article_border: #eee
28
+$main_bg: #fff
29 29
 
30
-!footer_color = #999
31
-!footer_bg = #444
30
+$footer_color: #999
31
+$footer_bg: #444
32 32
 
33 33
 // Form Colors
34
-!fieldset_bg = #ececec
35
-!fieldset_border = #c3c3c3
34
+$fieldset_bg: #ececec
35
+$fieldset_border: #c3c3c3
36 36
 
37
-!textinput_color = #333
38
-!textinput_bg = #f4f4f4
39
-!textinput_bg_focus = #fefeee
37
+$textinput_color: #333
38
+$textinput_bg: #f4f4f4
39
+$textinput_bg_focus: #fefeee
40 40
 
41
-!textinput_border_top = #aaa
42
-!textinput_border_bottom = #c6c6c6
43
-!textinput_border_left = #c3c3c3
44
-!textinput_border_right = #c3c3c3
45
-!textinput_border_focus = #989898
41
+$textinput_border_top: #aaa
42
+$textinput_border_bottom: #c6c6c6
43
+$textinput_border_left: #c3c3c3
44
+$textinput_border_right: #c3c3c3
45
+$textinput_border_focus: #989898
46 46
 
47
-!twitter_topic = #888
48 47
\ No newline at end of file
48
+$twitter_topic: #888
49 49
\ No newline at end of file
... ...
@@ -1,7 +1,7 @@
1 1
 !base_font_size = 16px
2 2
 !base_font_size_small = 13px
3 3
 !base_font_color = #333
4
-!default_border_radius = 6px
4
+$default_border_radius = 6px
5 5
 
6 6
 +general-typography
7 7
 =heading-font
... ...
@@ -1,24 +1,24 @@
1
-!default_link_color           ||= #165B94
2
-!default_link_color_hover     ||= #fff
3
-!default_link_color_alt       ||= #91D5F1
4
-!default_link_color_hover_alt ||= #000
1
+$default_link_color:           #165B94 !default
2
+$default_link_color_hover:     #fff !default
3
+$default_link_color_alt:       #91D5F1 !default
4
+$default_link_color_hover_alt: #000 !default
5 5
 
6
-=link-color(!hover = true)
7
-  +link-color-style(!default_link_color, !default_link_color_hover, !default_link_color, !hover)
6
+=link-color($hover: true)
7
+  +link-color-style($default_link_color, $default_link_color_hover, $default_link_color, $hover)
8 8
 
9
-=link-color-alt(!hover = true)
10
-  +link-color-style(!default_link_color_alt, !default_link_color_hover_alt, !default_link_color_alt, !hover)
9
+=link-color-alt($hover: true)
10
+  +link-color-style($default_link_color_alt, $default_link_color_hover_alt, $default_link_color_alt, $hover)
11 11
   
12
-=link-color-heading(!link_color = "inherit", !hover_bg_color = #ccc)
13
-  +link-color-style(!link_color,)
12
+=link-color-heading($link_color: "inherit", $hover_bg_color: #ccc)
13
+  +link-color-style($link_color)
14 14
 
15
-=link-color-style(!color = !default_link_color, !color_hover = !default_link_color_hover, !link_hover_bg = !color, !hover = true)
16
-  color= !color
15
+=link-color-style($color: $default_link_color, $color_hover: $default_link_color_hover, $link_hover_bg: $color, $hover: true)
16
+  color: $color
17 17
   padding: 2px
18 18
   margin: 0 -2px
19 19
   +border-radius(3px)
20
-  @if !hover
20
+  @if $hover
21 21
     &:hover
22
-      background-color= !link_hover_bg
23
-      color= !color_hover
22
+      background-color: $link_hover_bg
23
+      color: $color_hover
24 24
       text-decoration: none
25 25
\ No newline at end of file
... ...
@@ -1,11 +1,11 @@
1 1
 #header
2
-  background-color: {!header_bg}
3
-  border-bottom: 1px solid #{!header_border}
2
+  background-color: $header_bg
3
+  border-bottom: 1px solid #{$header_border}
4 4
   padding: 25px 0
5 5
   h1
6 6
     display: inline-block
7 7
     margin: 0
8 8
     a.title
9 9
       font-weight: normal
10
-      color: #{!title_color}
10
+      color: #{$title_color}
11 11
       text-decoration: none
12 12
\ No newline at end of file
... ...
@@ -1,11 +1,11 @@
1 1
 /* SASS mixins */
2
-@import library.sass
2
+@import "library"
3 3
 
4 4
 /* primary SASS */
5
-@import base.sass
6
-@import theme.sass
7
-@import typography.sass
8
-@import layout.sass
5
+@import "base"
6
+@import "theme"
7
+@import "typography"
8
+@import "layout"
9 9
 
10 10
 /* specific SASS */
11
-@import partials.sass
12 11
\ No newline at end of file
12
+@import "partials"
13 13
\ No newline at end of file