compass 0.10.0.rc5 → 0.10.0.rc6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (37) hide show
  1. data/VERSION.yml +1 -1
  2. data/frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/_screen.sass +1 -1
  3. data/frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/_typography.sass +2 -162
  4. data/frameworks/blueprint/stylesheets/_blueprint.scss +14 -6
  5. data/frameworks/blueprint/stylesheets/blueprint/_grid.scss +12 -8
  6. data/frameworks/blueprint/stylesheets/blueprint/_ie.scss +14 -13
  7. data/frameworks/blueprint/stylesheets/blueprint/_print.scss +15 -7
  8. data/frameworks/blueprint/stylesheets/blueprint/_rtl.scss +19 -8
  9. data/frameworks/blueprint/stylesheets/blueprint/_scaffolding.scss +8 -5
  10. data/frameworks/blueprint/stylesheets/blueprint/_typography.scss +22 -11
  11. data/frameworks/blueprint/templates/basic/partials/_base.sass +3 -3
  12. data/frameworks/blueprint/templates/buttons/buttons.sass +2 -2
  13. data/frameworks/blueprint/templates/project/partials/_base.sass +4 -4
  14. data/frameworks/blueprint/templates/project/screen.sass +6 -5
  15. data/frameworks/blueprint/templates/semantic/partials/_base.sass +4 -5
  16. data/frameworks/blueprint/templates/semantic/partials/_two_col.sass +5 -5
  17. data/frameworks/compass/stylesheets/compass/css3/_background-clip.scss +1 -0
  18. data/frameworks/compass/stylesheets/compass/css3/_background-origin.scss +1 -0
  19. data/frameworks/compass/stylesheets/compass/css3/_background-size.scss +1 -0
  20. data/frameworks/compass/stylesheets/compass/css3/_border-radius.scss +0 -3
  21. data/frameworks/compass/stylesheets/compass/css3/_box-sizing.scss +1 -0
  22. data/frameworks/compass/stylesheets/compass/css3/_box.scss +5 -0
  23. data/frameworks/compass/stylesheets/compass/css3/_columns.scss +2 -2
  24. data/frameworks/compass/stylesheets/compass/css3/_transition.scss +1 -1
  25. data/frameworks/compass/stylesheets/compass/utilities/general/_min.scss +1 -1
  26. data/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.scss +3 -3
  27. data/frameworks/compass/templates/ellipsis/ellipsis.sass +3 -3
  28. data/frameworks/compass/templates/project/screen.sass +0 -6
  29. data/lib/compass/commands/registry.rb +15 -2
  30. data/lib/compass/configuration/adapters.rb +4 -4
  31. data/lib/compass/exec/switch_ui.rb +4 -0
  32. data/lib/compass/sass_extensions/functions/font_files.rb +0 -1
  33. data/lib/compass/sass_extensions/functions/selectors.rb +1 -0
  34. data/lib/compass/sass_extensions/functions/urls.rb +6 -6
  35. data/test/configuration_test.rb +4 -4
  36. data/test/fixtures/stylesheets/blueprint/css/typography.css +3 -3
  37. metadata +3 -3
@@ -2,4 +2,4 @@
2
2
  :patch: 0
3
3
  :major: 0
4
4
  :minor: 10
5
- :build: rc5
5
+ :build: rc6
@@ -1,2 +1,2 @@
1
1
  @warn "DEPRECATED: blueprint/screen.sass will be removed. Please @import \"blueprint\" instead."
2
- @import blueprint.sass
2
+ @import blueprint
@@ -1,162 +1,2 @@
1
- @import colors.sass
2
- @import compass/utilities/links/link-colors
3
- @import compass/utilities/general/float
4
-
5
- !blueprint_font_family ||= "Helvetica Neue, Arial, Helvetica, sans-serif"
6
- !blueprint_fixed_font_family ||= "'andale mono', 'lucida console', monospace"
7
- !blueprint_font_size ||= 12px
8
-
9
- // Usage examples:
10
- // As a top-level mixin, apply to any page that includes the stylesheet:
11
- // +blueprint-typography
12
- // Scoped by a presentational class:
13
- // body.blueprint
14
- // +blueprint-typography(true)
15
- // Scoped by semantic selectors:
16
- // body#page-1, body#page-2, body.a-special-page-type
17
- // +blueprint-typography(true)
18
- // Deprecated:
19
- // You can pass the body selector as the first argument when used as a top-level mixin
20
- // +blueprint-typography("body#page-1, body#page-2, body.a-special-page-type")
21
- =blueprint-typography(!body_selector = "body")
22
- @if !body_selector == true
23
- +blueprint-typography-body
24
- +blueprint-typography-defaults
25
- @else
26
- #{!body_selector}
27
- +blueprint-typography-body
28
- @if !body_selector != "body"
29
- @warn "[DEPRECATED] To specify a the selector \"#{!body_selector}\" to +blueprint-typography, pass true as the first argument and mix it into #{!body_selector}."
30
- +blueprint-typography-defaults
31
- @if !body_selector == "body"
32
- +blueprint-typography-defaults
33
-
34
- =normal-text
35
- font-family= !blueprint_font_family
36
- color= !font_color
37
-
38
- =fixed-width-text
39
- font= 1em !blueprint_fixed_font_family
40
- line-height: 1.5
41
-
42
- =header-text
43
- font-weight: normal
44
- color= !header_color
45
-
46
- =quiet
47
- color= !quiet_color
48
-
49
- =loud
50
- color= !loud_color
51
-
52
- =blueprint-typography-body(!font_size = !blueprint_font_size)
53
- line-height: 1.5
54
- +normal-text
55
- font-size= 100% * !font_size / 16px
56
-
57
- =blueprint-typography-defaults
58
- h1
59
- +header-text
60
- font-size: 3em
61
- line-height: 1
62
- margin-bottom: 0.5em
63
- img
64
- margin: 0
65
- h2
66
- +header-text
67
- font-size: 2em
68
- margin-bottom: 0.75em
69
- h3
70
- +header-text
71
- font-size: 1.5em
72
- line-height: 1
73
- margin-bottom: 1em
74
- h4
75
- +header-text
76
- font-size: 1.2em
77
- line-height: 1.25
78
- margin-bottom: 1.25em
79
- h5
80
- +header-text
81
- font-size: 1em
82
- font-weight: bold
83
- margin-bottom: 1.5em
84
- h6
85
- +header-text
86
- font-size: 1em
87
- font-weight: bold
88
- h2 img, h3 img, h4 img, h5 img, h6 img
89
- margin: 0
90
- p
91
- margin: 0 0 1.5em
92
- img.left
93
- +float-left
94
- margin: 1.5em 1.5em 1.5em 0
95
- padding: 0
96
- img.right
97
- +float-right
98
- margin: 1.5em 0 1.5em 1.5em
99
- padding: 0
100
- a
101
- text-decoration: underline
102
- +link-colors(!link_color, !link_hover_color, !link_active_color, !link_visited_color, !link_focus_color)
103
- blockquote
104
- margin: 1.5em
105
- color: #666
106
- font-style: italic
107
- strong
108
- font-weight: bold
109
- em
110
- font-style: italic
111
- dfn
112
- font-style: italic
113
- font-weight: bold
114
- sup, sub
115
- line-height: 0
116
- abbr, acronym
117
- border-bottom: 1px dotted #666
118
- address
119
- margin: 0 0 1.5em
120
- font-style: italic
121
- del
122
- color: #666
123
- pre
124
- margin: 1.5em 0
125
- white-space: pre
126
- pre, code, tt
127
- +fixed-width-text
128
- li
129
- ul, ol
130
- margin: 0
131
- ul, ol
132
- margin: 0 1.5em 1.5em 0
133
- padding-left: 3.333em
134
- ul
135
- list-style-type: disc
136
- ol
137
- list-style-type: decimal
138
- dl
139
- margin: 0 0 1.5em 0
140
- dt
141
- font-weight: bold
142
- dd
143
- margin-left: 1.5em
144
- table
145
- margin-bottom: 1.4em
146
- width: 100%
147
- th
148
- font-weight: bold
149
- thead th
150
- background= !blueprint_table_header_color
151
- th, td, caption
152
- padding: 4px 10px 4px 5px
153
- tr.even td
154
- background= !blueprint_table_stripe_color
155
- tfoot
156
- font-style: italic
157
- caption
158
- background: #eee
159
- .quiet
160
- +quiet
161
- .loud
162
- +loud
1
+ @warn "DEPRECATED: blueprint/typography.sass will be removed. Please @import \"blueprint/typography\" instead."
2
+ @import "blueprint/typography"
@@ -11,19 +11,27 @@
11
11
  // ### Usage examples:
12
12
  //
13
13
  // As a top-level mixin, apply to any page that includes the stylesheet:
14
- // +blueprint
14
+ // <pre class="source-code sass">
15
+ // +blueprint
16
+ // </pre>
15
17
  //
16
18
  // Scoped by a presentational class:
17
- // body.blueprint
18
- // +blueprint(true)
19
+ // <pre class="source-code sass">
20
+ // body.blueprint
21
+ // +blueprint(true)
22
+ // </pre>
19
23
  //
20
24
  // Scoped by semantic selectors:
21
- // body#page-1, body#page-2, body.a-special-page-type
22
- // +blueprint(true)
25
+ // <pre class="source-code sass">
26
+ // body#page-1, body#page-2, body.a-special-page-type
27
+ // +blueprint(true)
28
+ // </pre>
23
29
  //
24
30
  // #### Deprecated:
25
31
  // You use to be able to pass the body selector as the first argument when used as a top-level mixin
26
- // +blueprint("body#page-1, body#page-2, body.a-special-page-type")
32
+ // <pre class="source-code sass">
33
+ // +blueprint("body#page-1, body#page-2, body.a-special-page-type")
34
+ // </pre>
27
35
 
28
36
  @mixin blueprint($body_selector: body) {
29
37
  //@doc off
@@ -189,15 +189,19 @@ $blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns
189
189
  // For example:
190
190
  //
191
191
  // HTML:
192
- // <div id="one">One</div>
193
- // <div id="two">Two</div>
192
+ // <pre class="source-code html">
193
+ // <div id="one">One</div>
194
+ // <div id="two">Two</div>
195
+ // </pre>
194
196
  // Sass:
195
- // #one
196
- // +column(18, true)
197
- // +prepend(6)
198
- // #two
199
- // +column(6)
200
- // +pull(18, true)
197
+ // <pre class="source-code sass">
198
+ // #one
199
+ // +column(18, true)
200
+ // +prepend(6)
201
+ // #two
202
+ // +column(6)
203
+ // +pull(18, true)
204
+ // </pre>
201
205
  @mixin pull($n, $last: false) {
202
206
  @include pull-base;
203
207
  @include pull-margins($n, $last); }
@@ -9,22 +9,23 @@
9
9
  //| --------------
10
10
  //|
11
11
  //| As a top-level mixin, apply to any page that includes the stylesheet:
12
- //|
13
- //| +blueprint-ie
14
- //|
12
+ //| <pre class="source-code sass">
13
+ //| +blueprint-ie
14
+ //| </pre>
15
15
  //| Scoped by a presentational class:
16
- //|
17
- //| body.blueprint
18
- //| +blueprint-ie(true)
19
- //|
16
+ //| <pre class="source-code sass">
17
+ //| body.blueprint
18
+ //| +blueprint-ie(true)
19
+ //| </pre>
20
20
  //| Scoped by semantic selectors:
21
- //|
22
- //| body#page-1, body#page-2, body.a-special-page-type
23
- //| +blueprint-ie(true)
24
- //|
21
+ //| <pre class="source-code sass">
22
+ //| body#page-1, body#page-2, body.a-special-page-type
23
+ //| +blueprint-ie(true)
24
+ //| </pre>
25
25
  //| **Deprecated:** You can pass the body selector as the first argument when used as a top-level mixin
26
- //|
27
- //| +blueprint-ie("body#page-1, body#page-2, body.a-special-page-type")
26
+ //| <pre class="source-code sass">
27
+ //| +blueprint-ie("body#page-1, body#page-2, body.a-special-page-type")
28
+ //| </pre>
28
29
  @mixin blueprint-ie($body_selector: body) {
29
30
  @if $body_selector == true {
30
31
  @include blueprint-ie-body;
@@ -3,16 +3,24 @@
3
3
 
4
4
  // Usage examples:
5
5
  // As a top-level mixin, apply to any page that includes the stylesheet:
6
- // +blueprint-print
6
+ // <pre class="source-code sass">
7
+ // +blueprint-print
8
+ // </pre>
7
9
  // Scoped by a presentational class:
8
- // body.blueprint
9
- // +blueprint-print(true)
10
+ // <pre class="source-code sass">
11
+ // body.blueprint
12
+ // +blueprint-print(true)
13
+ // </pre>
10
14
  // Scoped by semantic selectors:
11
- // body#page-1, body#page-2, body.a-special-page-type
12
- // +blueprint-print(true)
15
+ // <pre class="source-code sass">
16
+ // body#page-1, body#page-2, body.a-special-page-type
17
+ // +blueprint-print(true)
18
+ // </pre>
13
19
  // Deprecated:
14
- // You can pass the body selector as the first argument when used as a top-level mixin
15
- // +blueprint-print("body#page-1, body#page-2, body.a-special-page-type")
20
+ // You can pass the body selector as the first argument when used as a top-level mixin
21
+ // <pre class="source-code sass">
22
+ // +blueprint-print("body#page-1, body#page-2, body.a-special-page-type")
23
+ // </pre>
16
24
  @mixin blueprint-print($body_selector: body) {
17
25
  @if $body_selector == true {
18
26
  @include blueprint-print-body;
@@ -76,16 +76,27 @@ $blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns
76
76
 
77
77
  // Usage examples:
78
78
  // As a top-level mixin, apply to any page that includes the stylesheet:
79
- // +rtl-typography
79
+ // <pre class="source-code sass">
80
+ // +rtl-typography
81
+ // </pre>
82
+ //
80
83
  // Scoped by a presentational class:
81
- // body.blueprint
82
- // +rtl-typography(true)
84
+ // <pre class="source-code sass">
85
+ // body.blueprint
86
+ // +rtl-typography(true)
87
+ // </pre>
88
+ //
83
89
  // Scoped by semantic selectors:
84
- // body#page-1, body#page-2, body.a-special-page-type
85
- // +rtl-typography(true)
86
- // Deprecated:
87
- // You can pass the body selector as the first argument when used as a top-level mixin
88
- // +rtl-typography("body#page-1, body#page-2, body.a-special-page-type")
90
+ // <pre class="source-code sass">
91
+ // body#page-1, body#page-2, body.a-special-page-type
92
+ // +rtl-typography(true)
93
+ // </pre>
94
+ //
95
+ // **Deprecated**:
96
+ // You can pass the body selector as the first argument when used as a top-level mixin
97
+ // <pre class="source-code sass">
98
+ // +rtl-typography("body#page-1, body#page-2, body.a-special-page-type")
99
+ // </pre>
89
100
  @mixin rtl-typography($body_selector: body) {
90
101
  @if $body_selector == true {
91
102
  html & {
@@ -16,11 +16,14 @@
16
16
  // mixins to construct your own semantic style rules.
17
17
 
18
18
  @mixin blueprint-scaffolding($body_selector: body) {
19
- #{$body_selector} {
20
- @if $body_selector != "body" {
21
- @include blueprint-scaffolding-defaults; } }
22
- @if $body_selector == "body" {
23
- @include blueprint-scaffolding-defaults; } }
19
+ @if $body_selector != body {
20
+ #{$body_selector} {
21
+ @include blueprint-scaffolding-defaults;
22
+ }
23
+ } @else {
24
+ @include blueprint-scaffolding-defaults;
25
+ }
26
+ }
24
27
 
25
28
  // The styles this mixin provides were deprecated in Blueprint 0.9 and is no longer part of the
26
29
  // main scaffolding, but the mixin is still available if you want to use it.
@@ -10,16 +10,27 @@ $blueprint-font-size: 12px !default;
10
10
 
11
11
  // Usage examples:
12
12
  // As a top-level mixin, apply to any page that includes the stylesheet:
13
- // +blueprint-typography
13
+ // <pre class="source-code sass">
14
+ // +blueprint-typography
15
+ // </pre>
16
+ //
14
17
  // Scoped by a presentational class:
15
- // body.blueprint
16
- // +blueprint-typography(true)
18
+ // <pre class="source-code sass">
19
+ // body.blueprint
20
+ // +blueprint-typography(true)
21
+ // </pre>
22
+ //
17
23
  // Scoped by semantic selectors:
18
- // body#page-1, body#page-2, body.a-special-page-type
19
- // +blueprint-typography(true)
20
- // Deprecated:
21
- // You can pass the body selector as the first argument when used as a top-level mixin
22
- // +blueprint-typography("body#page-1, body#page-2, body.a-special-page-type")
24
+ // <pre class="source-code sass">
25
+ // body#page-1, body#page-2, body.a-special-page-type
26
+ // +blueprint-typography(true)
27
+ // </pre>
28
+ //
29
+ // **Deprecated**:
30
+ // You can pass the body selector as the first argument when used as a top-level mixin
31
+ // <pre class="source-code sass">
32
+ // +blueprint-typography("body#page-1, body#page-2, body.a-special-page-type")
33
+ // </pre>
23
34
  @mixin blueprint-typography($body-selector: body) {
24
35
  @if $body-selector == true {
25
36
  @include blueprint-typography-body;
@@ -53,11 +64,11 @@ $blueprint-font-size: 12px !default;
53
64
  @mixin blueprint-typography-defaults {
54
65
  #{headers(all)} { @include header-text;
55
66
  img { margin: 0; } }
56
- h1 { font-size: 3em; line-height: 1; margin-bottom: 0.5em; }
67
+ h1 { font-size: 3em; line-height: 1; margin-bottom: 0.50em; }
57
68
  h2 { font-size: 2em; margin-bottom: 0.75em; }
58
- h3 { font-size: 1.5em; line-height: 1; margin-bottom: 1em; }
69
+ h3 { font-size: 1.5em; line-height: 1; margin-bottom: 1.00em; }
59
70
  h4 { font-size: 1.2em; line-height: 1.25; margin-bottom: 1.25em; }
60
- h5 { font-size: 1em; font-weight: bold; margin-bottom: 1.5em; }
71
+ h5 { font-size: 1em; font-weight: bold; margin-bottom: 1.50em; }
61
72
  h6 { font-size: 1em; font-weight: bold; }
62
73
  p { margin: 0 0 1.5em;
63
74
  img.left { @include float-left; margin: 1.5em 1.5em 1.5em 0; padding: 0; }
@@ -1,9 +1,9 @@
1
1
  // Here is where you can define your constants for your application and to configure the blueprint framework.
2
2
  // Feel free to delete these if you want keep the defaults:
3
3
 
4
- !blueprint_grid_columns = 24
5
- !blueprint_grid_width = 30px
6
- !blueprint_grid_margin = 10px
4
+ $blueprint-grid-columns : 24
5
+ $blueprint-grid-width : 30px
6
+ $blueprint-grid-margin : 10px
7
7
 
8
8
  // If you change your grid column dimensions
9
9
  // you can make a new grid background image from the command line like this:
@@ -20,7 +20,7 @@ a.button
20
20
  // you can pass "left" or "right" to +anchor-button to float it in that direction
21
21
  // or you can pass no argument to leave it inline-block (cross browser safe!) within
22
22
  // the flow of your page.
23
- +anchor-button("left")
23
+ +anchor-button(left)
24
24
  // All the button color mixins take 4 optional arguments:
25
25
  // font color, background color, border color, border highlight color
26
26
  // the first three default to constants set in blueprint/buttons.sass
@@ -31,7 +31,7 @@ a.button
31
31
 
32
32
  button
33
33
  // The +button-button mixin is just like the +anchor-button mixin, but for <button> elements.
34
- +button-button("left")
34
+ +button-button(left)
35
35
  +button-colors
36
36
  +button-hover-colors
37
37
  +button-active-colors
@@ -1,11 +1,11 @@
1
1
  // Here is where you can define your constants for your application and to configure the blueprint framework.
2
2
  // Feel free to delete these if you want keep the defaults:
3
3
 
4
- !blueprint_grid_columns = 24
5
- !blueprint_container_size = 950px
6
- !blueprint_grid_margin = 10px
4
+ $blueprint-grid-columns : 24
5
+ $blueprint-container-size : 950px
6
+ $blueprint-grid-margin : 10px
7
7
 
8
8
  // Use this to calculate the width based on the total width.
9
9
  // Or you can set !blueprint_grid_width to a fixed value and unset !blueprint_container_size -- it will be calculated for you.
10
- !blueprint_grid_width = (!blueprint_container_size + !blueprint_grid_margin) / !blueprint_grid_columns - !blueprint_grid_margin
10
+ $blueprint-grid-width: ($blueprint-container-size + $blueprint-grid-margin) / $blueprint-grid-columns - $blueprint-grid-margin
11
11
 
@@ -27,15 +27,16 @@ body.two-col
27
27
  #container
28
28
  +container
29
29
  #header, #footer
30
- +column(!blueprint_grid_columns)
30
+ +column($blueprint-grid-columns)
31
31
  #sidebar
32
32
  // One third of the grid columns, rounding down. With 24 cols, this is 8.
33
- !sidebar_columns = floor(!blueprint_grid_columns / 3)
34
- +column(!sidebar_columns)
33
+ $sidebar-columns: floor($blueprint-grid-columns / 3)
34
+ +column($sidebar-columns)
35
35
  #content
36
36
  // Two thirds of the grid columns, rounding up.
37
37
  // With 24 cols, this is 16.
38
- !content_columns = ceil(2 * !blueprint_grid_columns / 3)
38
+ $content-columns: ceil(2 * $blueprint-grid-columns / 3)
39
39
  // true means it's the last column in the row
40
- +column(!content_columns, true)
40
+ +column($content-columns, true)
41
+
41
42
 
@@ -1,11 +1,10 @@
1
1
  // Here is where you can define your constants for your application and to configure the blueprint framework.
2
2
  // Feel free to delete these if you want keep the defaults:
3
3
 
4
- !blueprint_grid_columns = 24
5
- !blueprint_container_size = 950px
6
- !blueprint_grid_margin = 10px
4
+ $blueprint-grid-columns: 24
5
+ $blueprint-container-size: 950px
6
+ $blueprint-grid-margin: 10px
7
7
 
8
8
  // Use this to calculate the width based on the total width.
9
9
  // Or you can set !blueprint_grid_width to a fixed value and unset !blueprint_container_size -- it will be calculated for you.
10
- !blueprint_grid_width = (!blueprint_container_size + !blueprint_grid_margin) / !blueprint_grid_columns - !blueprint_grid_margin
11
-
10
+ $blueprint-grid-width: ($blueprint-container-size + $blueprint-grid-margin) / $blueprint-grid-columns - $blueprint-grid-margin
@@ -25,14 +25,14 @@ body.two-col
25
25
  #container
26
26
  +container
27
27
  #header, #footer
28
- +column(!blueprint_grid_columns)
28
+ +column($blueprint-grid-columns)
29
29
  #sidebar
30
30
  // One third of the grid columns, rounding down. With 24 cols, this is 8.
31
- !sidebar_columns = floor(!blueprint_grid_columns / 3)
32
- +column(!sidebar_columns)
31
+ $sidebar-columns: floor($blueprint-grid-columns / 3)
32
+ +column($sidebar-columns)
33
33
  #content
34
34
  // Two thirds of the grid columns, rounding up.
35
35
  // With 24 cols, this is 16.
36
- !content_columns = ceil(2 * !blueprint_grid_columns / 3)
36
+ $content-columns: ceil(2 * $blueprint-grid-columns / 3)
37
37
  // true means it's the last column in the row
38
- +column(!content_columns, true)
38
+ +column($content-columns, true)
@@ -19,6 +19,7 @@ $default-background-clip: padding-box !default;
19
19
 
20
20
  @mixin background-clip($clip: $default-background-clip) {
21
21
  // webkit and mozilla use the deprecated short [border | padding]
22
+ $clip: unquote($clip);
22
23
  $deprecated: $clip;
23
24
  @if $clip == padding-box { $deprecated: padding; }
24
25
  @if $clip == border-box { $deprecated: border; }
@@ -15,6 +15,7 @@ $default-background-origin: content-box !default;
15
15
 
16
16
 
17
17
  @mixin background-origin($origin: $default-background-origin) {
18
+ $origin: unquote($origin);
18
19
  // webkit and mozilla use the deprecated short [border | padding | content]
19
20
  $deprecated: $origin;
20
21
  @if $origin == padding-box { $deprecated: padding; }
@@ -9,5 +9,6 @@ $default-background-size: 100% auto !default;
9
9
  // * percentages are relative to the background-origin (default = padding-box)
10
10
  // * mixin defaults to: `$default-background-size`
11
11
  @mixin background-size($size: $default-background-size) {
12
+ $size: unquote($size);
12
13
  @include experimental(background-size, $size, -moz, -webkit, -o, not -ms, not -khtml);
13
14
  }
@@ -14,9 +14,6 @@ $default-border-radius: 5px !default;
14
14
  // * legal values for `$horz`: `left`, `right`
15
15
 
16
16
  @mixin border-corner-radius($vert, $horz, $radius: $default-border-radius) {
17
- border-#{$vert}-#{$horz}-radius: $radius;
18
- -moz-border-radius-#{$vert}#{$horz}: $radius;
19
- -webkit-border-#{$vert}-#{$horz}-radius: $radius;
20
17
  // Support for mozilla's syntax for specifying a corner
21
18
  @include experimental("border-radius-#{$vert}#{$horz}", $radius,
22
19
  -moz,
@@ -6,6 +6,7 @@
6
6
  // [ content-box | border-box ]
7
7
 
8
8
  @mixin box-sizing($bs) {
9
+ $bs: unquote($bs);
9
10
  @include experimental(box-sizing, $bs,
10
11
  -moz, -webkit, not -o, -ms, not -khtml, official
11
12
  );
@@ -14,6 +14,7 @@ $default-box-orient: horizontal !default;
14
14
  @mixin box-orient(
15
15
  $orientation: $default-box-orient
16
16
  ) {
17
+ $orientation : unquote($orientation);
17
18
  @include experimental(box-orient, $orientation,
18
19
  -moz, -webkit, not -o, not -ms, not -khtml, official
19
20
  );
@@ -26,6 +27,7 @@ $default-box-align: stretch !default;
26
27
  @mixin box-align(
27
28
  $alignment: $default-box-align
28
29
  ) {
30
+ $alignment : unquote($alignment);
29
31
  @include experimental(box-align, $alignment,
30
32
  -moz, -webkit, not -o, not -ms, not -khtml, official
31
33
  );
@@ -77,6 +79,7 @@ $default-box-direction: normal !default;
77
79
  @mixin box-direction(
78
80
  $direction: $default-box-direction
79
81
  ) {
82
+ $direction: unquote($direction);
80
83
  @include experimental(box-direction, $direction,
81
84
  -moz, -webkit, not -o, not -ms, not -khtml, official
82
85
  );
@@ -89,6 +92,7 @@ $default-box-lines: single !default;
89
92
  @mixin box-lines(
90
93
  $lines: $default-box-lines
91
94
  ) {
95
+ $lines: unquote($lines);
92
96
  @include experimental(box-lines, $lines,
93
97
  -moz, -webkit, not -o, not -ms, not -khtml, official
94
98
  );
@@ -101,6 +105,7 @@ $default-box-pack: start !default;
101
105
  @mixin box-pack(
102
106
  $pack: $default-box-pack
103
107
  ) {
108
+ $pack: unquote($pack);
104
109
  @include experimental(box-pack, $pack,
105
110
  -moz, -webkit, not -o, not -ms, not -khtml, official
106
111
  );
@@ -31,7 +31,7 @@
31
31
  // Specify the style of the rule between columns e.g. `dotted`.
32
32
  // This works like border-style.
33
33
  @mixin column-rule-style($s) {
34
- @include experimental(rule-style, $s,
34
+ @include experimental(rule-style, unquote($s),
35
35
  -moz, -webkit, -o, not -ms, not -khtml, official
36
36
  );
37
37
  }
@@ -40,7 +40,7 @@
40
40
  // This works like border-color.
41
41
 
42
42
  @mixin column-rule-color($c) {
43
- @include experimental(rule-color, $s,
43
+ @include experimental(rule-color, unquote($s),
44
44
  -moz, -webkit, -o, not -ms, not -khtml, official
45
45
  );
46
46
  }
@@ -29,7 +29,7 @@ $default-transition-delay: false !default;
29
29
  // * also accepts "all" or "none"
30
30
 
31
31
  @mixin transition-property($properties: $default-transition-property) {
32
- @include experimental(transition-property, $properties,
32
+ @include experimental(transition-property, unquote($properties),
33
33
  -moz, -webkit, -o, not -ms, not -khtml, official
34
34
  );
35
35
  }
@@ -13,4 +13,4 @@
13
13
  // @private This mixin is not meant to be used directly.
14
14
  @mixin hacked-minimum($property, $value) {
15
15
  min-#{$property}: $value;
16
- @include bang-hack($property, $value, auto); }
16
+ @include bang-hack($property, auto, $value); }
@@ -1,9 +1,9 @@
1
1
  @import "compass/css3/shared";
2
2
 
3
- // To get firefox2 support, you must install the ellipsis pattern:
3
+ // To get full firefox support, you must install the ellipsis pattern:
4
4
  //
5
5
  // compass install compass/ellipsis
6
- $firefox2-ellipsis: false !default;
6
+ $use-mozilla-ellipsis-binding: false !default;
7
7
 
8
8
  // This technique, by [Justin Maxwell](http://code404.com/), was originally
9
9
  // published [here](http://mattsnider.com/css/css-string-truncation-with-ellipsis/).
@@ -19,7 +19,7 @@ $firefox2-ellipsis: false !default;
19
19
  not -khtml,
20
20
  official
21
21
  );
22
- @if $experimental-support-for-mozilla and $firefox2-ellipsis {
22
+ @if $experimental-support-for-mozilla and $use-mozilla-ellipsis-binding {
23
23
  -moz-binding: stylesheet-url(unquote("xml/ellipsis.xml#ellipsis"));
24
24
  }
25
25
  }
@@ -1,6 +1,6 @@
1
- // Since you've installed the xml file, you must set
2
- // $firefox2-ellipsis to true before importing.
3
- $firefox2-ellipsis: true
1
+ // Since you've installed the xml file, you should set
2
+ // $use-mozilla-ellipsis-binding to true before importing.
3
+ $use-mozilla-ellipsis-binding: true
4
4
  @import compass/utilities/text/ellipsis
5
5
 
6
6
  // You can delete this sass file if you want, it's just an example of how to use the ellipsis mixin.
@@ -5,9 +5,3 @@
5
5
  <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css" />
6
6
 
7
7
  @import compass/reset
8
-
9
- /*
10
- The *:focus rule is reset and suppresses link outlining.
11
- You _must_ remember to redefine your own outline, as it’s an important accessibility aid. E.g.
12
- *:focus
13
- outline: #ccc dotted medium
@@ -6,11 +6,24 @@ module Compass::Commands
6
6
  end
7
7
  def get(name)
8
8
  @commands ||= Hash.new
9
- @commands[name.to_sym]
9
+ @commands[name.to_sym] || @commands[abbreviation_of(name)]
10
+ end
11
+ def abbreviation_of(name)
12
+ re = /^#{Regexp.escape(name)}/
13
+ matching = @commands.keys.select{|k| k.to_s =~ re}
14
+ if matching.size == 1
15
+ matching.first
16
+ else
17
+ raise Compass::Error, "Ambiguous abbreviation '#{name}'. Did you mean one of: #{matching.join(", ")}"
18
+ end
19
+ end
20
+ def abbreviation?(name)
21
+ re = /^#{Regexp.escape(name)}/
22
+ @commands.keys.detect{|k| k.to_s =~ re}
10
23
  end
11
24
  def command_exists?(name)
12
25
  @commands ||= Hash.new
13
- name && @commands.has_key?(name.to_sym)
26
+ name && (@commands.has_key?(name.to_sym) || abbreviation?(name))
14
27
  end
15
28
  def all
16
29
  @commands.keys
@@ -8,13 +8,13 @@ module Compass
8
8
  end
9
9
 
10
10
  def to_sass_plugin_options
11
- locations = {}
12
- locations[sass_path] = css_path if sass_path && css_path
11
+ locations = []
12
+ locations << [sass_path, css_path] if sass_path && css_path
13
13
  Compass::Frameworks::ALL.each do |framework|
14
- locations[framework.stylesheets_directory] = css_path || css_dir || "."
14
+ locations << [framework.stylesheets_directory, css_path || css_dir || "."]
15
15
  end
16
16
  resolve_additional_import_paths.each do |additional_path|
17
- locations[additional_path] = File.join(css_path || css_dir || ".", File.basename(additional_path))
17
+ locations << [additional_path, File.join(css_path || css_dir || ".", File.basename(additional_path))]
18
18
  end
19
19
  plugin_opts = {:template_location => locations}
20
20
  plugin_opts[:style] = output_style if output_style
@@ -120,6 +120,10 @@ END
120
120
  self.options[:pattern_name] = name
121
121
  end
122
122
 
123
+ opts.on("-x", "--syntax SYNTAX", [:sass, :scss], "Specify the syntax to use when generating stylesheets.", "One of sass or scss. Defaults to scss.") do |syntax|
124
+ self.options[:preferred_syntax] = syntax
125
+ end
126
+
123
127
  opts.on('--rails', "Sets the app type to a rails project (same as --app rails).") do
124
128
  self.options[:project_type] = :rails
125
129
  end
@@ -7,5 +7,4 @@ module Compass::SassExtensions::Functions::FontFiles
7
7
  end
8
8
  Sass::Script::String.new(files.join(", "))
9
9
  end
10
-
11
10
  end
@@ -60,4 +60,5 @@ module Compass::SassExtensions::Functions::Selectors
60
60
  end
61
61
  Sass::Script::String.new((from.value..to.value).map{|n| "h#{n}"}.join(", "))
62
62
  end
63
+ alias headings headers
63
64
  end
@@ -11,7 +11,7 @@ module Compass::SassExtensions::Functions::Urls
11
11
  Compass.configuration.http_root_relative(Compass.configuration.css_dir)
12
12
  end
13
13
 
14
- url("#{http_stylesheets_path}/#{path}")
14
+ clean_url("#{http_stylesheets_path}/#{path}")
15
15
  end
16
16
 
17
17
  def font_url(path)
@@ -30,7 +30,7 @@ module Compass::SassExtensions::Functions::Urls
30
30
  Compass.configuration.http_fonts_path
31
31
  end
32
32
 
33
- url("#{http_fonts_path}/#{path}")
33
+ clean_url("#{http_fonts_path}/#{path}")
34
34
  end
35
35
 
36
36
  def image_url(path)
@@ -75,18 +75,18 @@ module Compass::SassExtensions::Functions::Urls
75
75
  # prepend the asset host if there is one.
76
76
  path = "#{asset_host}#{'/' unless path[0..0] == "/"}#{path}" if asset_host
77
77
 
78
- url(path)
78
+ clean_url(path)
79
79
  end
80
80
 
81
+ private
82
+
81
83
  # Emits a url, taking off any leading "./"
82
- def url(url)
84
+ def clean_url(url)
83
85
  url = url.to_s
84
86
  url = url[0..1] == "./" ? url[2..-1] : url
85
87
  Sass::Script::String.new("url('#{url}')")
86
88
  end
87
89
 
88
- private
89
-
90
90
  def relative?
91
91
  Compass.configuration.relative_assets?
92
92
  end
@@ -81,8 +81,8 @@ class ConfigurationTest < Test::Unit::TestCase
81
81
 
82
82
  assert Compass.configuration.to_sass_engine_options[:load_paths].include?("/home/chris/my_compass_project/../foo")
83
83
  assert Compass.configuration.to_sass_engine_options[:load_paths].include?("/path/to/my/framework"), Compass.configuration.to_sass_engine_options[:load_paths].inspect
84
- assert_equal "/home/chris/my_compass_project/css/framework", Compass.configuration.to_sass_plugin_options[:template_location]["/path/to/my/framework"]
85
- assert_equal "/home/chris/my_compass_project/css/foo", Compass.configuration.to_sass_plugin_options[:template_location]["/home/chris/my_compass_project/../foo"]
84
+ assert_equal "/home/chris/my_compass_project/css/framework", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/path/to/my/framework"}[1]
85
+ assert_equal "/home/chris/my_compass_project/css/foo", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/home/chris/my_compass_project/../foo"}[1]
86
86
 
87
87
  expected_serialization = <<EXPECTED
88
88
  # Require any additional compass plugins here.
@@ -111,8 +111,8 @@ EXPECTED
111
111
 
112
112
  assert Compass.configuration.to_sass_engine_options[:load_paths].include?("/home/chris/my_compass_project/../foo")
113
113
  assert Compass.configuration.to_sass_engine_options[:load_paths].include?("/path/to/my/framework"), Compass.configuration.to_sass_engine_options[:load_paths].inspect
114
- assert_equal "/home/chris/my_compass_project/css/framework", Compass.configuration.to_sass_plugin_options[:template_location]["/path/to/my/framework"]
115
- assert_equal "/home/chris/my_compass_project/css/foo", Compass.configuration.to_sass_plugin_options[:template_location]["/home/chris/my_compass_project/../foo"]
114
+ assert_equal "/home/chris/my_compass_project/css/framework", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/path/to/my/framework"}[1]
115
+ assert_equal "/home/chris/my_compass_project/css/foo", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/home/chris/my_compass_project/../foo"}[1]
116
116
 
117
117
  expected_serialization = <<EXPECTED
118
118
  # Require any additional compass plugins here.
@@ -13,7 +13,7 @@ h1, h2, h3, h4, h5, h6 {
13
13
  h1 {
14
14
  font-size: 3em;
15
15
  line-height: 1;
16
- margin-bottom: 0.5em; }
16
+ margin-bottom: 0.50em; }
17
17
 
18
18
  h2 {
19
19
  font-size: 2em;
@@ -22,7 +22,7 @@ h2 {
22
22
  h3 {
23
23
  font-size: 1.5em;
24
24
  line-height: 1;
25
- margin-bottom: 1em; }
25
+ margin-bottom: 1.00em; }
26
26
 
27
27
  h4 {
28
28
  font-size: 1.2em;
@@ -32,7 +32,7 @@ h4 {
32
32
  h5 {
33
33
  font-size: 1em;
34
34
  font-weight: bold;
35
- margin-bottom: 1.5em; }
35
+ margin-bottom: 1.50em; }
36
36
 
37
37
  h6 {
38
38
  font-size: 1em;
metadata CHANGED
@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
6
6
  - 0
7
7
  - 10
8
8
  - 0
9
- - rc5
10
- version: 0.10.0.rc5
9
+ - rc6
10
+ version: 0.10.0.rc6
11
11
  platform: ruby
12
12
  authors:
13
13
  - Chris Eppstein
@@ -17,7 +17,7 @@ autorequire:
17
17
  bindir: bin
18
18
  cert_chain: []
19
19
 
20
- date: 2010-05-02 00:00:00 -07:00
20
+ date: 2010-05-08 00:00:00 -07:00
21
21
  default_executable: compass
22
22
  dependencies:
23
23
  - !ruby/object:Gem::Dependency