compass 0.10.0.rc4 → 0.10.0.rc5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (52) hide show
  1. data/VERSION.yml +1 -1
  2. data/examples/css3/extensions/fancy-fonts/templates/project/Prociono.otf +0 -0
  3. data/examples/css3/extensions/fancy-fonts/templates/project/bgrove.otf +0 -0
  4. data/examples/css3/extensions/fancy-fonts/templates/project/bgrove.ttf +0 -0
  5. data/examples/css3/extensions/fancy-fonts/templates/project/fancy-fonts.sass +7 -4
  6. data/examples/css3/extensions/fancy-fonts/templates/project/manifest.rb +5 -4
  7. data/examples/css3/gradients.html.haml +8 -0
  8. data/examples/css3/images/button_bg.png +0 -0
  9. data/examples/css3/images/example.png +0 -0
  10. data/examples/css3/src/fancy-fonts.scss +9 -3
  11. data/examples/css3/src/gradients.scss +35 -26
  12. data/examples/css3/src/main.scss +3 -3
  13. data/features/command_line.feature +4 -3
  14. data/frameworks/compass/stylesheets/compass/_reset.scss +1 -1
  15. data/frameworks/compass/stylesheets/compass/css3/_background-clip.scss +12 -12
  16. data/frameworks/compass/stylesheets/compass/css3/_background-origin.scss +12 -12
  17. data/frameworks/compass/stylesheets/compass/css3/_background-size.scss +1 -1
  18. data/frameworks/compass/stylesheets/compass/css3/_border-radius.scss +12 -12
  19. data/frameworks/compass/stylesheets/compass/css3/_box-shadow.scss +6 -2
  20. data/frameworks/compass/stylesheets/compass/css3/_box-sizing.scss +3 -1
  21. data/frameworks/compass/stylesheets/compass/css3/_box.scss +27 -9
  22. data/frameworks/compass/stylesheets/compass/css3/_columns.scss +33 -7
  23. data/frameworks/compass/stylesheets/compass/css3/_gradient.scss +25 -7
  24. data/frameworks/compass/stylesheets/compass/css3/_opacity.scss +18 -8
  25. data/frameworks/compass/stylesheets/compass/css3/_shared.scss +14 -14
  26. data/frameworks/compass/stylesheets/compass/css3/_text-shadow.scss +12 -13
  27. data/frameworks/compass/stylesheets/compass/css3/_transform.scss +6 -2
  28. data/frameworks/compass/stylesheets/compass/css3/_transition.scss +12 -4
  29. data/frameworks/compass/stylesheets/compass/reset/_utilities.scss +133 -0
  30. data/frameworks/compass/stylesheets/compass/utilities/_text.scss +1 -0
  31. data/frameworks/compass/stylesheets/compass/utilities/general/_reset.scss +2 -122
  32. data/frameworks/compass/stylesheets/compass/utilities/lists/_bullets.scss +1 -1
  33. data/frameworks/compass/stylesheets/compass/utilities/tables/_alternating-rows-and-columns.scss +4 -4
  34. data/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.scss +22 -9
  35. data/frameworks/compass/stylesheets/compass/utilities/text/_nowrap.scss +1 -2
  36. data/frameworks/compass/stylesheets/compass/utilities/text/_replacement.scss +19 -8
  37. data/frameworks/compass/templates/ellipsis/ellipsis.sass +3 -0
  38. data/lib/compass.rb +0 -7
  39. data/lib/compass/app_integration/rails/configuration_defaults.rb +1 -1
  40. data/lib/compass/app_integration/rails/templates/compass-install-rails.rb +10 -26
  41. data/lib/compass/commands/help.rb +1 -1
  42. data/lib/compass/commands/project_base.rb +1 -0
  43. data/lib/compass/commands/update_project.rb +5 -2
  44. data/lib/compass/commands/watch_project.rb +1 -0
  45. data/lib/compass/sass_extensions/functions/display.rb +2 -1
  46. data/lib/compass/sass_extensions/functions/gradient_support.rb +11 -0
  47. data/lib/compass/version.rb +9 -0
  48. data/test/fixtures/stylesheets/compass/css/reset.css +0 -4
  49. metadata +11 -8
  50. data/examples/css3/extensions/fancy-fonts/templates/project/Vtks Revolt.ttf +0 -0
  51. data/examples/css3/extensions/fancy-fonts/templates/project/angelina.ttf +0 -0
  52. data/examples/css3/images/fresh-peas.jpg +0 -0
@@ -2,4 +2,4 @@
2
2
  :patch: 0
3
3
  :major: 0
4
4
  :minor: 10
5
- :build: rc4
5
+ :build: rc5
@@ -1,7 +1,10 @@
1
- @import compass/css3.sass
1
+ @import compass/css3
2
2
 
3
- +font-face("Vtks Revolt", font-files("Vtks Revolt.ttf", 'truetype'))
4
- +font-face("Angelina", font-files("angelina.ttf", 'truetype'))
3
+ +font-face("Blooming Grove", font-files("bgrove.ttf", truetype, "bgrove.otf", opentype))
4
+ +font-face("Prociono", font-files("Prociono.otf", opentype))
5
5
  h1
6
- font-family: "Vtks Revolt"
6
+ font-family: "Blooming Grove"
7
7
  font-size: 3em
8
+ h2
9
+ font-family: "Prociono"
10
+ font-size: 2em
@@ -1,5 +1,6 @@
1
- # From http://www.dafont.com/vtks-revolt.font
2
- font 'Vtks Revolt.ttf'
3
- # From http://www.dafont.com/angelina.font
4
- font 'angelina.ttf'
1
+ # From http://openfontlibrary.org/media/files/jonadab/414
2
+ font 'bgrove.otf'
3
+ font 'bgrove.ttf'
4
+ # http://openfontlibrary.org/media/files/chemoelectric/206
5
+ font 'Prociono.otf'
5
6
  stylesheet 'fancy-fonts.sass'
@@ -57,4 +57,12 @@
57
57
  %th
58
58
  %td.linear-code
59
59
  %td.radial-code
60
+ %tr.with-bg
61
+ %th With Background Image
62
+ %td.linear <br><br><br>
63
+ %td.radial <br><br><br>
64
+ %tr.with-bg
65
+ %th
66
+ %td.linear-code
67
+ %td.radial-code
60
68
 
@@ -1,7 +1,13 @@
1
1
  @import "compass/css3";
2
2
 
3
- @include font-face(Angelina, font_files(unquote("angelina.ttf"), truetype));
3
+ @include font-face("Blooming Grove", font-files("bgrove.ttf", truetype, "bgrove.otf", opentype));
4
+
5
+ @include font-face("Prociono", font-files("Prociono.otf", opentype));
4
6
 
5
7
  h1 {
6
- font-family: "Angelina";
7
- font-size: 5em; }
8
+ font-family: "Blooming Grove";
9
+ font-size: 3em; }
10
+
11
+ h2 {
12
+ font-family: "Prociono";
13
+ font-size: 2em; }
@@ -11,67 +11,76 @@ thead th {
11
11
  @include text-shadow(white); }
12
12
 
13
13
  th.linear {
14
- @include linear-gradient(color_stops(white, red 50%, yellow 75%, lime)); }
14
+ @include linear-gradient(color-stops(white, red 50%, yellow 75%, lime)); }
15
15
 
16
16
  th.radial {
17
- @include radial-gradient(color_stops(white, red 20px, yellow 30px, lime 40px)); }
17
+ @include radial-gradient(color-stops(white, red 20px, yellow 30px, lime 40px)); }
18
18
 
19
19
  tr.default {
20
20
  td.linear {
21
- @include linear-gradient(color_stops(#cc0000, #0000cc)); }
21
+ @include linear-gradient(color-stops(#cc0000, #0000cc)); }
22
22
  td.radial {
23
- @include radial-gradient(color_stops(#cc0000, #0000cc)); }
23
+ @include radial-gradient(color-stops(#cc0000, #0000cc)); }
24
24
  td.linear-code:before {
25
- content: "+linear-gradient(color_stops(#c00, #00c))"; }
25
+ content: "+linear-gradient(color-stops(#c00, #00c))"; }
26
26
  td.radial-code:before {
27
- content: "+radial-gradient(color_stops(#c00, #00c))"; } }
27
+ content: "+radial-gradient(color-stops(#c00, #00c))"; } }
28
28
 
29
29
  tr.top-left {
30
30
  td.linear {
31
- @include linear-gradient(color_stops(#cc0000, #0000cc), unquote("top left")); }
31
+ @include linear-gradient(color-stops(#cc0000, #0000cc), unquote("top left")); }
32
32
  td.radial {
33
- @include radial-gradient(color_stops(#cc0000, #0000cc), unquote("top left")); }
33
+ @include radial-gradient(color-stops(#cc0000, #0000cc), unquote("top left")); }
34
34
  td.linear-code:before {
35
- content: '+linear-gradient(color_stops(#c00, #00c), "top left")'; }
35
+ content: '+linear-gradient(color-stops(#c00, #00c), "top left")'; }
36
36
  td.radial-code:before {
37
- content: '+radial-gradient(color_stops(#c00, #00c), "top left")'; } }
37
+ content: '+radial-gradient(color-stops(#c00, #00c), "top left")'; } }
38
38
 
39
39
  tr.bottom-right {
40
40
  td.linear {
41
- @include linear-gradient(color_stops(#cc0000, #0000cc), unquote("bottom right")); }
41
+ @include linear-gradient(color-stops(#cc0000, #0000cc), unquote("bottom right")); }
42
42
  td.radial {
43
- @include radial-gradient(color_stops(#cc0000, #0000cc), unquote("bottom right")); }
43
+ @include radial-gradient(color-stops(#cc0000, #0000cc), unquote("bottom right")); }
44
44
  td.linear-code:before {
45
- content: '+linear-gradient(color_stops(#c00, #00c), "bottom right")'; }
45
+ content: '+linear-gradient(color-stops(#c00, #00c), "bottom right")'; }
46
46
  td.radial-code:before {
47
- content: '+radial-gradient(color_stops(#c00, #00c), "bottom right")'; } }
47
+ content: '+radial-gradient(color-stops(#c00, #00c), "bottom right")'; } }
48
48
 
49
49
  tr.three-color {
50
50
  td.linear {
51
- @include linear-gradient(color_stops(#cc0000, white, #0000cc)); }
51
+ @include linear-gradient(color-stops(#cc0000, white, #0000cc)); }
52
52
  td.radial {
53
- @include radial-gradient(color_stops(#cc0000, white, #0000cc 50px)); }
53
+ @include radial-gradient(color-stops(#cc0000, white, #0000cc 50px)); }
54
54
  td.linear-code:before {
55
- content: "+linear-gradient(color_stops(#c00, #fff, #00c))"; }
55
+ content: "+linear-gradient(color-stops(#c00, #fff, #00c))"; }
56
56
  td.radial-code:before {
57
- content: "+radial-gradient(color_stops(#c00, #fff, #00c 50px))"; } }
57
+ content: "+radial-gradient(color-stops(#c00, #fff, #00c 50px))"; } }
58
58
 
59
59
  tr.four-color {
60
60
  td.linear {
61
- @include linear-gradient(color_stops(#cc0000, #00cc00 25%, #00cccc 75%, #0000cc)); }
61
+ @include linear-gradient(color-stops(#cc0000, #00cc00 25%, #00cccc 75%, #0000cc)); }
62
62
  td.radial {
63
- @include radial-gradient(color_stops(#cc0000, #00cc00 25%, #00cccc 75%, #0000cc 50px)); }
63
+ @include radial-gradient(color-stops(#cc0000, #00cc00 25%, #00cccc 75%, #0000cc 50px)); }
64
64
  td.linear-code:before {
65
- content: "+linear-gradient(color_stops(#c00, #0c0 25%, #0cc 75%, #00c))"; }
65
+ content: "+linear-gradient(color-stops(#c00, #0c0 25%, #0cc 75%, #00c))"; }
66
66
  td.radial-code:before {
67
- content: "+radial-gradient(color_stops(#c00, #0c0 25%, #0cc 75%, #00c 50px))"; } }
67
+ content: "+radial-gradient(color-stops(#c00, #0c0 25%, #0cc 75%, #00c 50px))"; } }
68
68
 
69
69
  tr.filled-in {
70
70
  td.linear {
71
- @include linear-gradient(color_stops(#cc0000 33%, #0000cc 66%)); }
71
+ @include linear-gradient(color-stops(#cc0000 33%, #0000cc 66%)); }
72
72
  td.radial {
73
- @include radial-gradient(color_stops(#cc0000 25px, #0000cc 75px)); }
73
+ @include radial-gradient(color-stops(#cc0000 25px, #0000cc 75px)); }
74
74
  td.linear-code:before {
75
- content: "+linear-gradient(color_stops(#c00 33%, #00c 66%))"; }
75
+ content: "+linear-gradient(color-stops(#c00 33%, #00c 66%))"; }
76
76
  td.radial-code:before {
77
- content: "+radial-gradient(color_stops(#c00 25px, #00c 75px))"; } }
77
+ content: "+radial-gradient(color-stops(#c00 25px, #00c 75px))"; } }
78
+ tr.with-bg {
79
+ td.linear {
80
+ @include linear-gradient(color-stops(#cc0000 33%, #0000cc 66%), top, image-url("button_bg.png")); }
81
+ td.radial {
82
+ @include radial-gradient(color-stops(#cc0000 25px, #0000cc 75px), center center, image-url("button_bg.png")); }
83
+ td.linear-code:before {
84
+ content: "+linear-gradient(color-stops(#cc0000 33%, #0000cc 66%), top, image-url(\"button_bg.png\"))"; }
85
+ td.radial-code:before {
86
+ content: "+radial-gradient(color-stops(#cc0000 25px, #0000cc 75px), center center, image-url(\"button_bg.png\"))"; } }
@@ -1,5 +1,6 @@
1
1
  @import "blueprint/reset";
2
2
  @import "base";
3
+ @import "fancy-fonts";
3
4
 
4
5
  $border_color: #aaaaaa;
5
6
 
@@ -28,7 +29,6 @@ h1 {
28
29
  @include box-shadow(darken($border_color, 40), 5px, 5px, 2px);
29
30
  margin-bottom: 1em;
30
31
  h2 {
31
- font-family: Angelina;
32
32
  margin: 0.5em 0 1em;
33
33
  text-align: center; } }
34
34
 
@@ -50,7 +50,7 @@ h1 {
50
50
 
51
51
  #background-clip {
52
52
  pre {
53
- background: transparent #{image_url("fresh-peas.jpg")} no-repeat;
53
+ background: transparent #{image_url("example.png")} no-repeat;
54
54
  border: 1em solid rgba(255, 0, 0, 0.25); }
55
55
  .padding-box {
56
56
  @include background-clip(padding-box);
@@ -61,7 +61,7 @@ h1 {
61
61
 
62
62
  #background-size {
63
63
  pre {
64
- background: transparent #{image_url("fresh-peas.jpg")} no-repeat;
64
+ background: transparent #{image_url("example.png")} no-repeat;
65
65
  border: 1em solid #{mix(red, white, 0.5)};
66
66
  border: 1em solid rgba(255, 0, 0, 0.25); }
67
67
  .top-left {
@@ -240,11 +240,12 @@ Feature: Command Line
240
240
  When I run: compass stats
241
241
  Then I am told statistics for each file:
242
242
  | Filename | Rules | Properties | Mixins Defs | Mixins Used | CSS Rules | CSS Properties |
243
+ | sass/box.sass | 15 | 0 | 0 | 19 | 15 | 59 |
243
244
  | sass/gradients.sass | 19 | 0 | 0 | 19 | 19 | 19 |
244
245
  | sass/image_size.sass | 4 | 8 | 0 | 0 | 4 | 8 |
245
246
  | sass/layout.sass | 0 | 0 | 0 | 1 | 5 | 10 |
246
247
  | sass/print.sass | 0 | 0 | 0 | 2 | 61 | 61 |
247
- | sass/reset.sass | 4 | 1 | 0 | 2 | 191 | 665 |
248
+ | sass/reset.sass | 4 | 1 | 0 | 2 | 190 | 664 |
248
249
  | sass/utilities.sass | 2 | 0 | 0 | 2 | 5 | 11 |
249
- | Total.* | 29 | 9 | 0 | 26 | 285 | 774 |
250
-
250
+ | Total.* | 44 | 9 | 0 | 45 | 299 | 832 |
251
+
@@ -1,3 +1,3 @@
1
- @import "utilities/general/reset";
1
+ @import "reset/utilities";
2
2
 
3
3
  @include global-reset;
@@ -24,19 +24,19 @@ $default-background-clip: padding-box !default;
24
24
  @if $clip == border-box { $deprecated: border; }
25
25
  // Support for webkit and mozilla's use of the deprecated short form
26
26
  @include experimental(background-clip, $deprecated,
27
- $experimental-support-for-mozilla,
28
- $experimental-support-for-webkit,
29
- false, // opera
30
- false, // microsoft
31
- false, // khtml
32
- false // official
27
+ -moz,
28
+ -webkit,
29
+ not -o,
30
+ not -ms,
31
+ not -khtml,
32
+ not official
33
33
  );
34
34
  @include experimental(background-clip, $clip,
35
- false, // mozilla
36
- false, // webkit
37
- $experimental-support-for-opera,
38
- $experimental-support-for-microsoft,
39
- $experimental-support-for-khtml,
40
- true // official
35
+ not -moz,
36
+ not -webkit,
37
+ -o,
38
+ -ms,
39
+ -khtml,
40
+ official
41
41
  );
42
42
  }
@@ -23,19 +23,19 @@ $default-background-origin: content-box !default;
23
23
 
24
24
  // Support for webkit and mozilla's use of the deprecated short form
25
25
  @include experimental(background-origin, $deprecated,
26
- $experimental-support-for-mozilla,
27
- $experimental-support-for-webkit,
28
- false, // opera
29
- false, // microsoft
30
- false, // khtml
31
- false // official
26
+ -moz,
27
+ -webkit,
28
+ not -o,
29
+ not -ms,
30
+ not -khtml,
31
+ not official
32
32
  );
33
33
  @include experimental(background-origin, $origin,
34
- false, // mozilla
35
- false, // webkit
36
- $experimental-support-for-opera,
37
- $experimental-support-for-microsoft,
38
- $experimental-support-for-khtml,
39
- true // official
34
+ not -moz,
35
+ not -webkit,
36
+ -o,
37
+ -ms,
38
+ -khtml,
39
+ official
40
40
  );
41
41
  }
@@ -9,5 +9,5 @@ $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
- @include experimental(background-size, $size);
12
+ @include experimental(background-size, $size, -moz, -webkit, -o, not -ms, not -khtml);
13
13
  }
@@ -19,20 +19,20 @@ $default-border-radius: 5px !default;
19
19
  -webkit-border-#{$vert}-#{$horz}-radius: $radius;
20
20
  // Support for mozilla's syntax for specifying a corner
21
21
  @include experimental("border-radius-#{$vert}#{$horz}", $radius,
22
- $experimental-support-for-mozilla,
23
- false, // webkit
24
- false, // opera
25
- false, // microsoft
26
- false, // khtml
27
- false // official
22
+ -moz,
23
+ not -webkit,
24
+ not -o,
25
+ not -ms,
26
+ not -khtml,
27
+ not official
28
28
  );
29
29
  @include experimental("border-#{$vert}-#{$horz}-radius", $radius,
30
- false, // mozilla
31
- $experimental-support-for-webkit,
32
- $experimental-support-for-opera,
33
- $experimental-support-for-microsoft,
34
- $experimental-support-for-khtml,
35
- true // official
30
+ not -moz,
31
+ -webkit,
32
+ -o,
33
+ -ms,
34
+ -khtml,
35
+ official
36
36
  );
37
37
 
38
38
  }
@@ -27,8 +27,12 @@ $default-box-shadow-blur: 5px !default;
27
27
  $blur: $default-box-shadow-blur
28
28
  ) {
29
29
  @if $color == none {
30
- @include experimental(box-shadow, none);
30
+ @include experimental(box-shadow, none,
31
+ -moz, -webkit, -o, not -ms, not -khtml, official
32
+ );
31
33
  } @else {
32
- @include experimental(box-shadow, $color $hoff $voff $blur);
34
+ @include experimental(box-shadow, $color $hoff $voff $blur,
35
+ -moz, -webkit, -o, not -ms, not -khtml, official
36
+ );
33
37
  }
34
38
  }
@@ -6,5 +6,7 @@
6
6
  // [ content-box | border-box ]
7
7
 
8
8
  @mixin box-sizing($bs) {
9
- @include experimental(box-sizing, $bs);
9
+ @include experimental(box-sizing, $bs,
10
+ -moz, -webkit, not -o, -ms, not -khtml, official
11
+ );
10
12
  }
@@ -2,7 +2,9 @@
2
2
 
3
3
  // display:box; must be used for any of the other flexbox mixins to work properly
4
4
  @mixin display-box {
5
- @include experimental-value(display,box);
5
+ @include experimental-value(display, box,
6
+ -moz, -webkit, not -o, not -ms, not -khtml, official
7
+ );
6
8
  }
7
9
 
8
10
  // Default box orientation, assuming that the user wants something less block-like
@@ -12,7 +14,9 @@ $default-box-orient: horizontal !default;
12
14
  @mixin box-orient(
13
15
  $orientation: $default-box-orient
14
16
  ) {
15
- @include experimental(box-orient, $orientation);
17
+ @include experimental(box-orient, $orientation,
18
+ -moz, -webkit, not -o, not -ms, not -khtml, official
19
+ );
16
20
  }
17
21
 
18
22
  // Default box-align
@@ -22,7 +26,9 @@ $default-box-align: stretch !default;
22
26
  @mixin box-align(
23
27
  $alignment: $default-box-align
24
28
  ) {
25
- @include experimental(box-align, $alignment);
29
+ @include experimental(box-align, $alignment,
30
+ -moz, -webkit, not -o, not -ms, not -khtml, official
31
+ );
26
32
  }
27
33
 
28
34
  // Default box flex
@@ -34,7 +40,9 @@ $default-box-flex: 0 !default;
34
40
  @mixin box-flex(
35
41
  $flex: $default-box-flex
36
42
  ) {
37
- @include experimental(box-flex, $flex);
43
+ @include experimental(box-flex, $flex,
44
+ -moz, -webkit, not -o, not -ms, not -khtml, official
45
+ );
38
46
  display: block;
39
47
  }
40
48
 
@@ -45,7 +53,9 @@ $default-box-flex-group: 1 !default;
45
53
  @mixin box-flex-group(
46
54
  $group: $default-box-flex-group
47
55
  ) {
48
- @include experimental(box-flex-group, $group);
56
+ @include experimental(box-flex-group, $group,
57
+ -moz, -webkit, not -o, not -ms, not -khtml, official
58
+ );
49
59
  }
50
60
 
51
61
  // default for ordinal group
@@ -55,7 +65,9 @@ $default-box-ordinal-group: 1 !default;
55
65
  @mixin box-ordinal-group(
56
66
  $group: $default-ordinal-flex-group
57
67
  ) {
58
- @include experimental(box-ordinal-group, $group);
68
+ @include experimental(box-ordinal-group, $group,
69
+ -moz, -webkit, not -o, not -ms, not -khtml, official
70
+ );
59
71
  }
60
72
 
61
73
  // Box direction default value
@@ -65,7 +77,9 @@ $default-box-direction: normal !default;
65
77
  @mixin box-direction(
66
78
  $direction: $default-box-direction
67
79
  ) {
68
- @include experimental(box-direction, $direction);
80
+ @include experimental(box-direction, $direction,
81
+ -moz, -webkit, not -o, not -ms, not -khtml, official
82
+ );
69
83
  }
70
84
 
71
85
  // default for box lines
@@ -75,7 +89,9 @@ $default-box-lines: single !default;
75
89
  @mixin box-lines(
76
90
  $lines: $default-box-lines
77
91
  ) {
78
- @include experimental(box-lines, $lines);
92
+ @include experimental(box-lines, $lines,
93
+ -moz, -webkit, not -o, not -ms, not -khtml, official
94
+ );
79
95
  }
80
96
 
81
97
  // default for box pack
@@ -85,5 +101,7 @@ $default-box-pack: start !default;
85
101
  @mixin box-pack(
86
102
  $pack: $default-box-pack
87
103
  ) {
88
- @include experimental(box-pack, $pack);
104
+ @include experimental(box-pack, $pack,
105
+ -moz, -webkit, not -o, not -ms, not -khtml, official
106
+ );
89
107
  }