compass 0.10.3.pre.1 → 0.10.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. data/VERSION.yml +1 -1
  2. data/frameworks/blueprint/stylesheets/blueprint/_buttons.scss +4 -7
  3. data/frameworks/blueprint/stylesheets/blueprint/_fancy-type.scss +1 -2
  4. data/frameworks/compass/stylesheets/compass/utilities/general/_hacks.scss +23 -3
  5. data/frameworks/compass/stylesheets/compass/utilities/text/_replacement.scss +1 -1
  6. data/lib/compass/configuration/data.rb +11 -1
  7. data/lib/compass/configuration/serialization.rb +6 -0
  8. data/lib/compass/exec/global_options_parser.rb +18 -3
  9. data/test/fixtures/stylesheets/blueprint/css/screen.css +2 -6
  10. data/test/fixtures/stylesheets/blueprint/css/single-imports/grid.css +1 -3
  11. data/test/fixtures/stylesheets/blueprint/css/single-imports/liquid.css +1 -3
  12. data/test/fixtures/stylesheets/blueprint/css/single-imports/rtl.css +1 -3
  13. data/test/fixtures/stylesheets/blueprint/css/single-imports/scaffolding.css +1 -1
  14. data/test/fixtures/stylesheets/blueprint/css/single-imports/utilities.css +1 -3
  15. data/test/fixtures/stylesheets/compass/css/images.css +1 -1
  16. data/test/fixtures/stylesheets/compass/css/legacy_clearfix.css +17 -0
  17. data/test/fixtures/stylesheets/compass/css/lists.css +3 -9
  18. data/test/fixtures/stylesheets/compass/css/utilities.css +2 -6
  19. data/test/fixtures/stylesheets/compass/sass/legacy_clearfix.scss +11 -0
  20. metadata +10 -10
data/VERSION.yml CHANGED
@@ -2,4 +2,4 @@
2
2
  :major: 0
3
3
  :minor: 10
4
4
  :patch: 3
5
- :build: pre.1
5
+ #:build: 0
data/frameworks/blueprint/stylesheets/blueprint/_buttons.scss CHANGED
@@ -23,8 +23,7 @@ $blueprint_button_active_font_color: white !default;
23
23
  // Sets the colors for a button
24
24
  // @param border_highlight_color
25
25
  // The highlight color defaults to whatever is the value of the border_color but it's one shade lighter.
26
- @mixin button-colors
27
- (
26
+ @mixin button-colors(
28
27
  $font_color: $blueprint_button_font_color,
29
28
  $bg_color: $blueprint_button_background_color,
30
29
  $border_color: $blueprint_button_border_color,
@@ -39,8 +38,7 @@ $blueprint_button_active_font_color: white !default;
39
38
  // Sets the colors for a button in the active state
40
39
  // @param border_highlight_color
41
40
  // The highlight color defaults to whatever is the value of the border_color but it's one shade lighter.
42
- @mixin button-active-colors
43
- (
41
+ @mixin button-active-colors(
44
42
  $font_color: $blueprint_button_active_font_color,
45
43
  $bg_color: $blueprint_button_active_background_color,
46
44
  $border_color: $blueprint_button_active_border_color,
@@ -55,8 +53,7 @@ $blueprint_button_active_font_color: white !default;
55
53
  // Sets the colors for a button in the hover state.
56
54
  // @param border_highlight_color
57
55
  // The highlight color defaults to whatever is the value of the border_color but it's one shade lighter.
58
- @mixin button-hover-colors
59
- (
56
+ @mixin button-hover-colors(
60
57
  $font_color: $blueprint_button_hover_font_color,
61
58
  $bg_color: $blueprint_button_hover_background_color,
62
59
  $border_color: $blueprint_button_hover_border_color,
@@ -101,4 +98,4 @@ $blueprint_button_active_font_color: white !default;
101
98
  *:first-child+html &[type] {
102
99
  padding: 4px 10px 3px 7px;
103
100
  }
104
- }
101
+ }
data/frameworks/blueprint/stylesheets/blueprint/_fancy-type.scss CHANGED
@@ -56,8 +56,7 @@ $alternate-text-font : "Warnock Pro", "Goudy Old Style", "Palatino", "Book Antiq
56
56
  // `$base-font-size` - The base font size in pixels. Defaults to 12px
57
57
  // `$old-line-height` - The old line height. Defaults to 1.5 times the base-font-size
58
58
 
59
- @mixin incr
60
- (
59
+ @mixin incr(
61
60
  $font-size: 10px,
62
61
  $base-font-size: $blueprint-font-size,
63
62
  $old-line-height: $base-font-size * 1.5
data/frameworks/compass/stylesheets/compass/utilities/general/_hacks.scss CHANGED
@@ -1,12 +1,32 @@
1
+ // The `zoom` approach generates less CSS but does not validate.
2
+ // Set this to `block` to use the display-property to hack the
3
+ // element to gain layout.
4
+ $default-has-layout-approach: zoom !default;
5
+
1
6
  // This mixin causes an element matching the selector
2
7
  // to gain the "hasLayout" property in internet explorer.
3
8
  // More information on [hasLayout](http://reference.sitepoint.com/css/haslayout).
4
- @mixin has-layout {
9
+ @mixin has-layout($using: $default-has-layout-approach) {
10
+ @if $using == zoom {
11
+ @include has-layout-zoom;
12
+ } @else if $using == block {
13
+ @include has-layout-block;
14
+ } @else {
15
+ @warn "Unknown has-layout approach: #{$using}";
16
+ @include has-layout-zoom;
17
+ }
18
+ }
19
+
20
+ @mixin has-layout-zoom {
21
+ *zoom: 1;
22
+ }
23
+
24
+ @mixin has-layout-block {
5
25
  // This makes ie6 get layout
6
26
  display: inline-block;
7
27
  // and this puts it back to block
8
- & {
9
- display: block; } }
28
+ & { display: block; }
29
+ }
10
30
 
11
31
  // A hack to supply IE6 (and below) with a different property value.
12
32
  // [Read more](http://www.cssportal.com/css-hacks/#in_css-important).
data/frameworks/compass/stylesheets/compass/utilities/text/_replacement.scss CHANGED
@@ -26,7 +26,7 @@
26
26
 
27
27
  // Hides text in an element so you can see the background.
28
28
  @mixin hide-text {
29
- text-indent: -9999em;
29
+ text-indent: -119988px;
30
30
  overflow: hidden;
31
31
  text-align: left;
32
32
  }
data/lib/compass/configuration/data.rb CHANGED
@@ -25,7 +25,7 @@ module Compass
25
25
  extend Compass::Configuration::Paths
26
26
 
27
27
  inherited_accessor *ATTRIBUTES
28
- inherited_accessor :required_libraries #XXX we should make this array add up cumulatively.
28
+ inherited_accessor :required_libraries, :loaded_frameworks, :framework_path #XXX we should make these arrays add up cumulatively.
29
29
 
30
30
  strip_trailing_separator *ATTRIBUTES.select{|a| a.to_s =~ /dir|path/}
31
31
 
@@ -95,6 +95,16 @@ module Compass
95
95
  super
96
96
  end
97
97
 
98
+ def load(framework_dir)
99
+ (self.loaded_frameworks ||= []) << framework_dir
100
+ Compass::Frameworks.register_directory framework_dir
101
+ end
102
+
103
+ def discover(frameworks_dir)
104
+ (self.framework_path ||= []) << frameworks_dir
105
+ Compass::Frameworks.discover frameworks_dir
106
+ end
107
+
98
108
  def relative_assets?
99
109
  # the http_images_path is deprecated, but here for backwards compatibility.
100
110
  relative_assets || http_images_path == :relative
data/lib/compass/configuration/serialization.rb CHANGED
@@ -56,6 +56,12 @@ module Compass
56
56
  (required_libraries || []).each do |lib|
57
57
  contents << %Q{require '#{lib}'\n}
58
58
  end
59
+ (loaded_frameworks || []).each do |lib|
60
+ contents << %Q{load '#{lib}'\n}
61
+ end
62
+ (framework_path || []).each do |lib|
63
+ contents << %Q{discover '#{lib}'\n}
64
+ end
59
65
  contents << "# Require any additional compass plugins here.\n"
60
66
  contents << "\n" if (required_libraries || []).any?
61
67
  ATTRIBUTES.each do |prop|
data/lib/compass/exec/global_options_parser.rb CHANGED
@@ -7,9 +7,24 @@ module Compass::Exec::GlobalOptionsParser
7
7
  opts.on('-r LIBRARY', '--require LIBRARY',
8
8
  "Require the given ruby LIBRARY before running commands.",
9
9
  " This is used to access compass plugins without having a",
10
- " project configuration file.") do |library|
11
- ::Compass.configuration.require library
12
- end
10
+ " project configuration file."
11
+ ) do |library|
12
+ ::Compass.configuration.require library
13
+ end
14
+
15
+ opts.on('-l FRAMEWORK_DIR', '--load FRAMEWORK_DIR',
16
+ "Load the framework or extensions found in the FRAMEWORK directory."
17
+ ) do |framework_dir|
18
+ require 'pathname'
19
+ ::Compass.configuration.load Pathname.new(framework_dir).realpath
20
+ end
21
+
22
+ opts.on('-L FRAMEWORKS_DIR', '--load-all FRAMEWORKS_DIR',
23
+ "Load all the frameworks or extensions found in the FRAMEWORKS_DIR directory."
24
+ ) do |frameworks_dir|
25
+ require 'pathname'
26
+ ::Compass.configuration.discover Pathname.new(frameworks_dir).realpath
27
+ end
13
28
 
14
29
  opts.on('-q', '--quiet', :NONE, 'Quiet mode.') do
15
30
  self.options[:quiet] = true
data/test/fixtures/stylesheets/blueprint/css/screen.css CHANGED
@@ -200,9 +200,7 @@ caption {
200
200
 
201
201
  .clearfix {
202
202
  overflow: hidden;
203
- display: inline-block; }
204
- .clearfix {
205
- display: block; }
203
+ *zoom: 1; }
206
204
 
207
205
  .small {
208
206
  font-size: 0.8em;
@@ -234,9 +232,7 @@ caption {
234
232
  width: 950px;
235
233
  margin: 0 auto;
236
234
  overflow: hidden;
237
- display: inline-block; }
238
- .container {
239
- display: block; }
235
+ *zoom: 1; }
240
236
 
241
237
  .column, div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, div.span-21, div.span-22, div.span-23, div.span-24 {
242
238
  display: inline;
data/test/fixtures/stylesheets/blueprint/css/single-imports/grid.css CHANGED
@@ -2,9 +2,7 @@
2
2
  width: 950px;
3
3
  margin: 0 auto;
4
4
  overflow: hidden;
5
- display: inline-block; }
6
- .container {
7
- display: block; }
5
+ *zoom: 1; }
8
6
 
9
7
  .column, div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, div.span-21, div.span-22, div.span-23, div.span-24 {
10
8
  display: inline;
data/test/fixtures/stylesheets/blueprint/css/single-imports/liquid.css CHANGED
@@ -3,9 +3,7 @@
3
3
  width: 80%;
4
4
  margin: 0 auto;
5
5
  overflow: hidden;
6
- display: inline-block; }
7
- .container {
8
- display: block; }
6
+ *zoom: 1; }
9
7
 
10
8
  .span-1 {
11
9
  width: 3.167%; }
data/test/fixtures/stylesheets/blueprint/css/single-imports/rtl.css CHANGED
@@ -3,9 +3,7 @@
3
3
  margin: 0 auto;
4
4
  direction: rtl;
5
5
  overflow: hidden;
6
- display: inline-block; }
7
- .container {
8
- display: block; }
6
+ *zoom: 1; }
9
7
 
10
8
  .column, div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, div.span-21, div.span-22, div.span-23, div.span-24 {
11
9
  display: inline;
data/test/fixtures/stylesheets/blueprint/css/single-imports/scaffolding.css CHANGED
@@ -42,4 +42,4 @@ form.inline {
42
42
  margin-bottom: 0; }
43
43
 
44
44
  body {
45
- margin: 1.5em 0; }
45
+ margin: 1.5em 0; }
data/test/fixtures/stylesheets/blueprint/css/single-imports/utilities.css CHANGED
@@ -6,9 +6,7 @@
6
6
 
7
7
  .clearfix {
8
8
  overflow: hidden;
9
- display: inline-block; }
10
- .clearfix {
11
- display: block; }
9
+ *zoom: 1; }
12
10
 
13
11
  .small {
14
12
  font-size: 0.8em;
data/test/fixtures/stylesheets/compass/css/images.css CHANGED
@@ -5,4 +5,4 @@
5
5
  background-image: url('/images/4x6.png?busted=true'); }
6
6
 
7
7
  .absolute {
8
- background-image: url(http://example.com/images/4x6.png); }
8
+ background-image: url(http://example.com/images/4x6.png); }
data/test/fixtures/stylesheets/compass/css/legacy_clearfix.css ADDED
@@ -0,0 +1,17 @@
1
+ .clearfix {
2
+ overflow: hidden;
3
+ display: inline-block; }
4
+ .clearfix {
5
+ display: block; }
6
+
7
+ .pie-clearfix {
8
+ display: inline-block; }
9
+ .pie-clearfix:after {
10
+ content: "\0020";
11
+ display: block;
12
+ height: 0;
13
+ clear: both;
14
+ overflow: hidden;
15
+ visibility: hidden; }
16
+ .pie-clearfix {
17
+ display: block; }
data/test/fixtures/stylesheets/compass/css/lists.css CHANGED
@@ -4,9 +4,7 @@ ul.horizontal {
4
4
  border: 0;
5
5
  outline: 0;
6
6
  overflow: hidden;
7
- display: inline-block; }
8
- ul.horizontal {
9
- display: block; }
7
+ *zoom: 1; }
10
8
  ul.horizontal li {
11
9
  list-style-image: none;
12
10
  list-style-type: none;
@@ -27,9 +25,7 @@ ul.wide-horizontal {
27
25
  border: 0;
28
26
  outline: 0;
29
27
  overflow: hidden;
30
- display: inline-block; }
31
- ul.wide-horizontal {
32
- display: block; }
28
+ *zoom: 1; }
33
29
  ul.wide-horizontal li {
34
30
  list-style-image: none;
35
31
  list-style-type: none;
@@ -50,9 +46,7 @@ ul.right-horizontal {
50
46
  border: 0;
51
47
  outline: 0;
52
48
  overflow: hidden;
53
- display: inline-block; }
54
- ul.right-horizontal {
55
- display: block; }
49
+ *zoom: 1; }
56
50
  ul.right-horizontal li {
57
51
  list-style-image: none;
58
52
  list-style-type: none;
data/test/fixtures/stylesheets/compass/css/utilities.css CHANGED
@@ -1,11 +1,9 @@
1
1
  .clearfix {
2
2
  overflow: hidden;
3
- display: inline-block; }
4
- .clearfix {
5
- display: block; }
3
+ *zoom: 1; }
6
4
 
7
5
  .pie-clearfix {
8
- display: inline-block; }
6
+ *zoom: 1; }
9
7
  .pie-clearfix:after {
10
8
  content: "\0020";
11
9
  display: block;
@@ -13,5 +11,3 @@
13
11
  clear: both;
14
12
  overflow: hidden;
15
13
  visibility: hidden; }
16
- .pie-clearfix {
17
- display: block; }
data/test/fixtures/stylesheets/compass/sass/legacy_clearfix.scss ADDED
@@ -0,0 +1,11 @@
1
+ $default-has-layout-approach: block;
2
+
3
+ @import "compass/utilities";
4
+
5
+ .clearfix {
6
+ @include clearfix;
7
+ }
8
+
9
+ .pie-clearfix {
10
+ @include pie-clearfix;
11
+ }
metadata CHANGED
@@ -1,14 +1,12 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: compass
3
3
  version: !ruby/object:Gem::Version
4
- prerelease: true
4
+ prerelease: false
5
5
  segments:
6
6
  - 0
7
7
  - 10
8
8
  - 3
9
- - pre
10
- - 1
11
- version: 0.10.3.pre.1
9
+ version: 0.10.3
12
10
  platform: ruby
13
11
  authors:
14
12
  - Chris Eppstein
@@ -18,7 +16,7 @@ autorequire:
18
16
  bindir: bin
19
17
  cert_chain: []
20
18
 
21
- date: 2010-07-24 00:00:00 -07:00
19
+ date: 2010-08-01 00:00:00 -07:00
22
20
  default_executable: compass
23
21
  dependencies:
24
22
  - !ruby/object:Gem::Dependency
@@ -517,6 +515,7 @@ files:
517
515
  - test/fixtures/stylesheets/compass/css/image_size.css
518
516
  - test/fixtures/stylesheets/compass/css/images.css
519
517
  - test/fixtures/stylesheets/compass/css/layout.css
518
+ - test/fixtures/stylesheets/compass/css/legacy_clearfix.css
520
519
  - test/fixtures/stylesheets/compass/css/lists.css
521
520
  - test/fixtures/stylesheets/compass/css/print.css
522
521
  - test/fixtures/stylesheets/compass/css/reset.css
@@ -532,6 +531,7 @@ files:
532
531
  - test/fixtures/stylesheets/compass/sass/image_size.sass
533
532
  - test/fixtures/stylesheets/compass/sass/images.scss
534
533
  - test/fixtures/stylesheets/compass/sass/layout.sass
534
+ - test/fixtures/stylesheets/compass/sass/legacy_clearfix.scss
535
535
  - test/fixtures/stylesheets/compass/sass/lists.scss
536
536
  - test/fixtures/stylesheets/compass/sass/print.sass
537
537
  - test/fixtures/stylesheets/compass/sass/reset.sass
@@ -573,13 +573,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
573
573
  version: "0"
574
574
  required_rubygems_version: !ruby/object:Gem::Requirement
575
575
  requirements:
576
- - - ">"
576
+ - - ">="
577
577
  - !ruby/object:Gem::Version
578
578
  segments:
579
- - 1
580
- - 3
581
- - 1
582
- version: 1.3.1
579
+ - 0
580
+ version: "0"
583
581
  requirements: []
584
582
 
585
583
  rubyforge_project:
@@ -651,6 +649,7 @@ test_files:
651
649
  - test/fixtures/stylesheets/compass/css/image_size.css
652
650
  - test/fixtures/stylesheets/compass/css/images.css
653
651
  - test/fixtures/stylesheets/compass/css/layout.css
652
+ - test/fixtures/stylesheets/compass/css/legacy_clearfix.css
654
653
  - test/fixtures/stylesheets/compass/css/lists.css
655
654
  - test/fixtures/stylesheets/compass/css/print.css
656
655
  - test/fixtures/stylesheets/compass/css/reset.css
@@ -666,6 +665,7 @@ test_files:
666
665
  - test/fixtures/stylesheets/compass/sass/image_size.sass
667
666
  - test/fixtures/stylesheets/compass/sass/images.scss
668
667
  - test/fixtures/stylesheets/compass/sass/layout.sass
668
+ - test/fixtures/stylesheets/compass/sass/legacy_clearfix.scss
669
669
  - test/fixtures/stylesheets/compass/sass/lists.scss
670
670
  - test/fixtures/stylesheets/compass/sass/print.sass
671
671
  - test/fixtures/stylesheets/compass/sass/reset.sass