RubyGems - compass - Versions diffs - 0.12.alpha.0 → 0.12.alpha.1 - Mend

compass 0.12.alpha.0 → 0.12.alpha.1

Files changed (206) hide show

data/Rakefile +1 -0
data/VERSION.yml +1 -1
data/bin/compass +1 -1
data/bin/compass.compiled.rbc +707 -0
data/examples/downloader.rb +3 -2
data/examples/ninesixty/bootstrap.rb +1 -1
data/features/command_line.feature +17 -17
data/features/extensions.feature +6 -0
data/features/step_definitions/command_line_steps.rb +2 -0
data/frameworks/compass/stylesheets/compass/_support.scss +1 -1
data/frameworks/compass/stylesheets/compass/css3/_box-shadow.scss +7 -24
data/frameworks/compass/stylesheets/compass/css3/_font-face.scss +0 -15
data/frameworks/compass/stylesheets/compass/css3/_shared.scss +12 -12
data/frameworks/compass/stylesheets/compass/css3/_text-shadow.scss +6 -20
data/frameworks/compass/stylesheets/compass/css3/_transition.scss +38 -24
data/frameworks/compass/stylesheets/compass/css3/_user-interface.scss +19 -0
data/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss +12 -3
data/frameworks/compass/stylesheets/compass/typography/lists/_bullets.scss +1 -1
data/frameworks/compass/stylesheets/compass/typography/lists/_inline-block-list.scss +14 -11
data/frameworks/compass/stylesheets/compass/utilities/sprites/_sprite-img.scss +29 -6
data/frameworks/compass/templates/pie/PIE.htc +83 -64
data/lib/compass.rbc +42 -36
data/lib/compass/actions.rb +0 -1
data/lib/compass/actions.rbc +244 -85
data/lib/compass/app_integration.rbc +28 -20
data/lib/compass/app_integration/merb.rbc +8 -4
data/lib/compass/app_integration/rails.rbc +664 -148
data/lib/compass/app_integration/rails/actionpack31/helpers.rb +23 -0
data/lib/compass/app_integration/rails/actionpack31/railtie.rb +8 -10
data/lib/compass/app_integration/rails/configuration_defaults.rbc +1089 -332
data/lib/compass/app_integration/rails/installer.rbc +145 -61
data/lib/compass/app_integration/stand_alone.rbc +15 -15
data/lib/compass/app_integration/stand_alone/configuration_defaults.rbc +23 -23
data/lib/compass/app_integration/stand_alone/installer.rbc +52 -32
data/lib/compass/browser_support.rbc +35 -23
data/lib/compass/commands.rbc +307 -0
data/lib/compass/commands/base.rbc +1044 -0
data/lib/compass/commands/clean_project.rbc +1856 -0
data/lib/compass/commands/create_project.rbc +2691 -0
data/lib/compass/commands/default.rbc +1677 -0
data/lib/compass/commands/generate_grid_background.rbc +1939 -0
data/lib/compass/commands/help.rbc +1921 -0
data/lib/compass/commands/imports.rbc +969 -0
data/lib/compass/commands/installer_command.rbc +807 -0
data/lib/compass/commands/interactive.rbc +1341 -0
data/lib/compass/commands/list_frameworks.rbc +1111 -0
data/lib/compass/commands/print_version.rbc +2478 -0
data/lib/compass/commands/project_base.rbc +2085 -0
data/lib/compass/commands/project_stats.rb +7 -7
data/lib/compass/commands/project_stats.rbc +4202 -0
data/lib/compass/commands/registry.rbc +1350 -0
data/lib/compass/commands/sprite.rbc +2212 -0
data/lib/compass/commands/stamp_pattern.rbc +2011 -0
data/lib/compass/commands/unpack_extension.rbc +2348 -0
data/lib/compass/commands/update_project.rbc +3002 -0
data/lib/compass/commands/validate_project.rbc +1686 -0
data/lib/compass/commands/watch_project.rbc +4155 -0
data/lib/compass/commands/write_configuration.rbc +2896 -0
data/lib/compass/compiler.rb +3 -0
data/lib/compass/compiler.rbc +591 -398
data/lib/compass/configuration.rbc +134 -78
data/lib/compass/configuration/adapters.rbc +98 -40
data/lib/compass/configuration/comments.rbc +132 -51
data/lib/compass/configuration/data.rb +6 -0
data/lib/compass/configuration/data.rbc +541 -551
data/lib/compass/configuration/defaults.rbc +764 -189
data/lib/compass/configuration/file_data.rbc +37 -125
data/lib/compass/configuration/helpers.rb +1 -0
data/lib/compass/configuration/helpers.rbc +433 -153
data/lib/compass/configuration/inheritance.rb +2 -0
data/lib/compass/configuration/inheritance.rbc +412 -165
data/lib/compass/configuration/paths.rbc +9 -9
data/lib/compass/configuration/serialization.rbc +151 -84
data/lib/compass/dependencies.rbc +16 -4
data/lib/compass/errors.rbc +5 -5
data/lib/compass/exec.rbc +500 -0
data/lib/compass/exec/command_option_parser.rbc +676 -0
data/lib/compass/exec/global_options_parser.rbc +1306 -0
data/lib/compass/exec/helpers.rbc +758 -0
data/lib/compass/exec/project_options_parser.rbc +1515 -0
data/lib/compass/exec/sub_command_ui.rbc +1191 -0
data/lib/compass/frameworks.rb +10 -4
data/lib/compass/frameworks.rbc +118 -66
data/lib/compass/grid_builder.rbc +0 -0
data/lib/compass/installers.rbc +152 -0
data/lib/compass/installers/bare_installer.rbc +939 -0
data/lib/compass/installers/base.rbc +4427 -0
data/lib/compass/installers/manifest.rbc +3335 -0
data/lib/compass/installers/manifest_installer.rbc +1591 -0
data/lib/compass/installers/template_context.rbc +1030 -0
data/lib/compass/logger.rbc +2317 -0
data/lib/compass/quick_cache.rbc +12 -8
data/lib/compass/sass_extensions.rbc +8 -4
data/lib/compass/sass_extensions/functions.rb +4 -2
data/lib/compass/sass_extensions/functions.rbc +90 -57
data/lib/compass/sass_extensions/functions/colors.rbc +22 -18
data/lib/compass/sass_extensions/functions/constants.rbc +45 -25
data/lib/compass/sass_extensions/functions/cross_browser_support.rbc +48 -36
data/lib/compass/sass_extensions/functions/display.rbc +341 -107
data/lib/compass/sass_extensions/functions/enumerate.rbc +9 -9
data/lib/compass/sass_extensions/functions/env.rb +5 -0
data/lib/compass/sass_extensions/functions/env.rbc +299 -0
data/lib/compass/sass_extensions/functions/font_files.rb +32 -3
data/lib/compass/sass_extensions/functions/font_files.rbc +540 -123
data/lib/compass/sass_extensions/functions/gradient_support.rbc +379 -167
data/lib/compass/sass_extensions/functions/image_size.rb +19 -16
data/lib/compass/sass_extensions/functions/image_size.rbc +715 -400
data/lib/compass/sass_extensions/functions/inline_image.rb +1 -1
data/lib/compass/sass_extensions/functions/inline_image.rbc +152 -98
data/lib/compass/sass_extensions/functions/lists.rbc +75 -39
data/lib/compass/sass_extensions/functions/selectors.rbc +36 -28
data/lib/compass/sass_extensions/functions/sprites.rb +27 -4
data/lib/compass/sass_extensions/functions/sprites.rbc +255 -233
data/lib/compass/sass_extensions/functions/trig.rbc +53 -51
data/lib/compass/sass_extensions/functions/urls.rbc +3151 -1044
data/lib/compass/sass_extensions/monkey_patches.rbc +5 -5
data/lib/compass/sass_extensions/monkey_patches/browser_support.rbc +63 -47
data/lib/compass/sass_extensions/monkey_patches/traversal.rbc +36 -16
data/lib/compass/sass_extensions/sprites.rbc +93 -13
data/lib/compass/sass_extensions/sprites/engines.rbc +615 -6
data/lib/compass/sass_extensions/sprites/engines/chunky_png_engine.rbc +260 -94
data/lib/compass/sass_extensions/sprites/image.rb +5 -5
data/lib/compass/sass_extensions/sprites/image.rbc +694 -316
data/lib/compass/sass_extensions/sprites/image_methods.rbc +900 -0
data/lib/compass/sass_extensions/sprites/image_row.rbc +1168 -0
data/lib/compass/sass_extensions/sprites/layout_methods.rb +12 -8
data/lib/compass/sass_extensions/sprites/layout_methods.rbc +3236 -0
data/lib/compass/sass_extensions/sprites/row_fitter.rb +7 -1
data/lib/compass/sass_extensions/sprites/row_fitter.rbc +2067 -0
data/lib/compass/sass_extensions/sprites/sprite_map.rb +1 -1
data/lib/compass/sass_extensions/sprites/sprite_map.rbc +714 -3641
data/lib/compass/sass_extensions/sprites/sprite_methods.rb +24 -4
data/lib/compass/sass_extensions/sprites/sprite_methods.rbc +3190 -0
data/lib/compass/sprite_importer.rb +15 -80
data/lib/compass/sprite_importer.rbc +1125 -1495
data/lib/compass/sprite_importer/binding.rb +11 -0
data/lib/compass/sprite_importer/content.erb +81 -0
data/lib/compass/util.rbc +19 -11
data/lib/compass/version.rbc +53 -25
data/test/fixtures/extensions/only_stylesheets/compass_init.rb +1 -0
data/test/fixtures/extensions/only_stylesheets/scss/only_stylesheets/foo.scss +3 -0
data/test/fixtures/fonts/bgrove.base64.txt +1 -0
data/test/fixtures/fonts/bgrove.ttf +0 -0
data/test/fixtures/sprites/public/images/bool/false.png +0 -0
data/test/fixtures/sprites/public/images/bool/true.png +0 -0
data/test/fixtures/stylesheets/blueprint/css/screen.css +1 -2
data/test/fixtures/stylesheets/blueprint/css/single-imports/debug.css +1 -2
data/test/fixtures/stylesheets/compass/css/border_radius.css +6 -9
data/test/fixtures/stylesheets/compass/css/box.css +0 -19
data/test/fixtures/stylesheets/compass/css/box_shadow.css +3 -6
data/test/fixtures/stylesheets/compass/css/columns.css +8 -16
data/test/fixtures/stylesheets/compass/css/grid_background.css +4 -8
data/test/fixtures/stylesheets/compass/css/lists.css +7 -7
data/test/fixtures/stylesheets/compass/css/pie.css +2 -3
data/test/fixtures/stylesheets/compass/css/reset.css +0 -1
data/test/fixtures/stylesheets/compass/css/sprites.css +1 -1
data/test/fixtures/stylesheets/compass/css/text_shadow.css +0 -3
data/test/fixtures/stylesheets/compass/css/transform.css +28 -92
data/test/fixtures/stylesheets/compass/css/transition.css +11 -0
data/test/fixtures/stylesheets/compass/css/user-interface.css +4 -0
data/test/fixtures/stylesheets/compass/images/{flag-s8c3c755a68.png → flag-s8f1e8fdb9b.png} +0 -0
data/test/fixtures/stylesheets/compass/sass/text_shadow.scss +0 -1
data/test/fixtures/stylesheets/compass/sass/transition.scss +4 -0
data/test/fixtures/stylesheets/compass/sass/user-interface.scss +5 -0
data/test/fixtures/stylesheets/envtest/config.rb +9 -0
data/test/fixtures/stylesheets/envtest/css/env.css +2 -0
data/test/fixtures/stylesheets/envtest/sass/env.scss +3 -0
data/test/fixtures/stylesheets/envtest/tmp/env.css +2 -0
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/config.rb +25 -0
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/ie.scss +5 -0
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/print.scss +3 -0
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/screen.scss +6 -0
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/ie.css +5 -0
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/print.css +3 -0
data/test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/screen.css +68 -0
data/test/helpers/command_line.rbc +2820 -0
data/test/helpers/diff.rbc +1104 -0
data/test/helpers/io.rbc +962 -0
data/test/helpers/rails.rbc +1116 -0
data/test/helpers/test_case.rbc +1255 -0
data/test/integrations/compass_test.rb +24 -2
data/test/integrations/compass_test.rbc +6589 -0
data/test/integrations/rails_integration_test.rbc +1342 -0
data/test/integrations/sprites_test.rb +123 -25
data/test/integrations/sprites_test.rbc +6192 -0
data/test/test_helper.rb +7 -5
data/test/test_helper.rbc +1694 -0
data/test/tmp/compass_rails/public/images/{selectors-sef52c5c63a.png → selectors-s4c703bbc05.png} +0 -0
data/test/units/actions_test.rbc +644 -0
data/test/units/command_line_test.rbc +1532 -0
data/test/units/compass_png_test.rbc +0 -0
data/test/units/configuration_test.rbc +3833 -0
data/test/units/rails_configuration_test.rbc +1032 -0
data/test/units/sass_extensions_test.rb +31 -0
data/test/units/sass_extensions_test.rbc +3586 -0
data/test/units/sprites/engine_test.rbc +962 -0
data/test/units/sprites/image_row_test.rbc +1578 -0
data/test/units/sprites/image_test.rb +3 -3
data/test/units/sprites/image_test.rbc +2836 -0
data/test/units/sprites/importer_test.rb +6 -0
data/test/units/sprites/importer_test.rbc +2620 -0
data/test/units/sprites/row_fitter_test.rbc +1479 -0
data/test/units/sprites/sprite_command_test.rbc +1147 -0
data/test/units/sprites/sprite_map_test.rb +19 -6
data/test/units/sprites/sprite_map_test.rbc +6515 -0
metadata +180 -54

data/lib/compass/configuration/inheritance.rb CHANGED

@@ -137,6 +137,8 @@ module Compass
         def read_without_default(attribute)
           if set?(attribute)
             send("raw_#{attribute}")
+          elsif inherited_data.nil?
+            nil
           elsif inherited_data.respond_to?("#{attribute}_without_default")
             inherited_data.send("#{attribute}_without_default")
           elsif inherited_data.respond_to?(attribute)

data/lib/compass/configuration/inheritance.rbc CHANGED

@@ -1,5 +1,5 @@
 !RBIX
-333337424968067900
+9595534255132031488
 x
 M
 1
@@ -364,8 +364,8 @@ e
 I
 22
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -391,7 +391,7 @@ x
 12
 ClassMethods
 i
-44
+58
 5
 66
 99
@@ -435,6 +435,20 @@ i
 49
 3
 4
+15
+99
+7
+8
+7
+9
+65
+67
+49
+2
+0
+49
+3
+4
 11
 I
 5
@@ -446,7 +460,7 @@ I
 0
 n
 p
-8
+10
 x
 16
 inherited_writer
@@ -696,8 +710,8 @@ I
 I
 56
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 2
 x
@@ -722,8 +736,8 @@ I
 I
 8
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -963,8 +977,8 @@ I
 I
 4c
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 2
 x
@@ -989,8 +1003,8 @@ I
 I
 8
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -1063,15 +1077,176 @@ I
 I
 14
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
 10
 attributes
-p
+x
+14
+chained_method
+M
+1
+n
+n
+x
+14
+chained_method
+i
+52
+4
+65
+79
+81
+0
+19
+1
+15
+5
+7
+1
+20
+0
+47
+101
+2
+7
+3
+20
+0
+47
+101
+2
+7
+4
+20
+0
+47
+101
+2
+7
+5
+20
+0
+47
+101
+2
+7
+6
+63
+9
+65
+49
 7
+0
+20
+1
+47
+49
+8
+3
+11
+I
+c
+I
+2
+I
+1
+I
+1
+n
+p
+9
+x
+1
++
+s
+36
+            alias_method :_chained_
+x
+4
+to_s
+s
+25
+, method
+            def
+s
+39
+(*args, &block)
+              _chained_
+s
+79
+(*args, &block)
+              if inherited_data
+                inherited_data.
+s
+60
+(*args, &block)
+              end
+            end
+x
+11
+active_path
+x
+10
+class_eval
+p
+19
+I
+-1
+I
+40
+I
+0
+I
+41
+I
+8
+I
+4a
+I
+9
+I
+42
+I
+b
+I
+43
+I
+12
+I
+44
+I
+19
+I
+45
+I
+20
+I
+47
+I
+29
+I
+4a
+I
+34
+x
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
+p
+2
+x
+6
+method
+x
+4
+line
+p
+9
 I
 2
 I
@@ -1086,9 +1261,13 @@ I
 3b
 I
 2c
+I
+40
+I
+3a
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0
 x
@@ -1363,16 +1542,16 @@ p
 I
 -1
 I
-45
+52
 I
 0
 I
-46
+53
 I
 6
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0
 x
@@ -1453,36 +1632,40 @@ x
 11
 respond_to?
 p
-13
+15
 I
 -1
 I
-49
+56
 I
 0
 I
-bc
+c9
 I
 1
 I
-4a
+57
 I
 c
 I
-4b
+58
 I
 17
 I
-4c
+59
 I
 22
 I
-4b
+58
+I
+23
+I
+0
 I
 24
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -1552,36 +1735,40 @@ x
 15
 inherited_data=
 p
-13
+15
 I
 -1
 I
-51
+5e
 I
 0
 I
-52
+5f
 I
 6
 I
-53
+60
 I
 11
 I
-bc
+c9
 I
 12
 I
-55
+62
+I
+1c
+I
+0
 I
 1d
 I
-57
+64
 I
 1f
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -1629,20 +1816,20 @@ p
 I
 -1
 I
-5a
+67
 I
 0
 I
-bc
+c9
 I
 1
 I
-5b
+68
 I
 b
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0
 x
@@ -1696,24 +1883,24 @@ p
 I
 -1
 I
-5e
+6b
 I
 0
 I
-5f
+6c
 I
 8
 I
-60
+6d
 I
 b
 I
-61
+6e
 I
 11
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -1810,28 +1997,28 @@ p
 I
 -1
 I
-64
+71
 I
 0
 I
-65
+72
 I
 10
 I
-66
+73
 I
 20
 I
-67
+74
 I
 28
 I
-68
+75
 I
 2a
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -1901,20 +2088,20 @@ p
 I
 -1
 I
-6b
+78
 I
 0
 I
-6c
+79
 I
 10
 I
-6d
+7a
 I
 18
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -1972,16 +2159,16 @@ p
 I
 -1
 I
-70
+7d
 I
 0
 I
-71
+7e
 I
 f
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0
 x
@@ -2058,32 +2245,36 @@ x
 4
 send
 p
-11
+13
 I
 -1
 I
-74
+81
 I
 0
 I
-75
+82
 I
 f
 I
-76
+83
 I
 18
 I
-77
+84
 I
 21
 I
-76
+83
+I
+22
+I
+0
 I
 23
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 2
 x
@@ -2218,44 +2409,48 @@ x
 11
 respond_to?
 p
-17
+19
 I
 -1
 I
-7c
+89
 I
 0
 I
-7d
+8a
 I
 9
 I
-7e
+8b
 I
 19
 I
-7f
+8c
 I
 2a
 I
-80
+8d
 I
 3b
 I
-81
+8e
 I
 45
 I
-82
+8f
 I
 4f
 I
-81
+8e
+I
+50
+I
+0
 I
 51
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -2337,28 +2532,32 @@ x
 11
 default_for
 p
-9
+11
 I
 -1
 I
-88
+95
 I
 0
 I
-89
+96
 I
 15
 I
-8c
+99
 I
 1f
 I
-8a
+97
+I
+21
+I
+0
 I
 22
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 2
 x
@@ -2463,28 +2662,32 @@ x
 5
 raise
 p
-9
+11
 I
 -1
 I
-90
+9d
 I
 4
 I
-91
+9e
 I
 9
 I
-92
+9f
 I
 23
 I
-94
+a1
+I
+30
+I
+0
 I
 31
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 3
 x
@@ -2551,36 +2754,40 @@ x
 14
 inherited_data
 p
-13
+15
 I
 -1
 I
-98
+a5
 I
 0
 I
-99
+a6
 I
 5
 I
-9a
+a7
 I
 8
 I
-9b
+a8
 I
 d
 I
-9c
+a9
 I
 17
 I
-9e
+ab
+I
+18
+I
+0
 I
 19
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -2657,28 +2864,32 @@ x
 2
 <<
 p
-9
+11
 I
 -1
 I
-a2
+af
 I
 0
 I
-a3
+b0
 I
 6
 I
-a4
+b1
+I
+21
+I
+0
 I
 23
 I
-a5
+b2
 I
 26
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -3094,44 +3305,80 @@ x
 2
 <<
 p
-17
+35
 I
 0
 I
-ac
+b9
 I
 4
 I
-ad
+ba
 I
 7
 I
-b2
+bf
 I
 10
 I
-ae
+bb
+I
+2b
+I
+0
+I
+30
+I
+bb
+I
+46
+I
+0
 I
 4e
 I
-af
+bc
+I
+69
+I
+0
+I
+6e
+I
+bc
+I
+84
+I
+0
 I
 8c
 I
-b0
+bd
+I
+a7
+I
+0
+I
+ac
+I
+bd
+I
+c2
+I
+0
 I
 ca
 I
-b1
+be
 I
 d8
 I
-ad
+ba
 I
 dc
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -3148,24 +3395,24 @@ p
 I
 0
 I
-aa
+b7
 I
 4
 I
-ab
+b8
 I
 9
 I
-ac
+b9
 I
 12
 I
-b4
+c1
 I
 21
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 2
 x
@@ -3182,24 +3429,24 @@ p
 I
 -1
 I
-a8
+b5
 I
 0
 I
-a9
+b6
 I
 a
 I
-aa
+b7
 I
 13
 I
-b6
+c3
 I
 16
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 1
 x
@@ -3210,68 +3457,68 @@ p
 I
 2
 I
-45
+52
 I
 10
 I
-49
+56
 I
 1e
 I
-51
+5e
 I
 2c
 I
-5a
+67
 I
 3a
 I
-5e
+6b
 I
 48
 I
-64
+71
 I
 56
 I
-6b
+78
 I
 64
 I
-70
+7d
 I
 72
 I
-74
+81
 I
 80
 I
-7c
+89
 I
 8e
 I
-88
+95
 I
 9c
 I
-90
+9d
 I
 aa
 I
-98
+a5
 I
 b8
 I
-a2
+af
 I
 c6
 I
-a8
+b5
 I
 d4
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0
 p
@@ -3287,12 +3534,12 @@ I
 I
 27
 I
-43
+50
 I
 41
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0
 x
@@ -3307,8 +3554,8 @@ I
 I
 1c
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0
 x
@@ -3323,8 +3570,8 @@ I
 I
 1c
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0
 x
@@ -3339,7 +3586,7 @@ I
 I
 1c
 x
-70
-/Users/chris/Projects/compass/lib/compass/configuration/inheritance.rb
+72
+/Users/crispee/Projects/compass/lib/compass/configuration/inheritance.rb
 p
 0