compass 0.10.0.pre5 → 0.10.0.pre6

data/frameworks/blueprint/stylesheets/blueprint/_liquid.sass

@@ -36,13 +36,13 @@
 // Main layout grid, override these constants to build your grid and container sizes.
 // The width shown gives the right floored percentage values.
 !blueprint_liquid_grid_columns ||= 24
-!blueprint_liquid_grid_width   ||= 4.173%
-!blueprint_liquid_grid_margin  ||= 0.833em
+!blueprint_liquid_grid_width   ||= 3.167%
+!blueprint_liquid_grid_margin  ||= 1.042%
 
 // Do not edit below this line unless you really know what you're doing.
 !blueprint_liquid_container_width = 80%
 !blueprint_liquid_container_min_width = 950px
-!blueprint_liquid_grid_push_pull = -(!blueprint_liquid_grid_margin * 4)
+!blueprint_liquid_grid_push_pull = -(!blueprint_liquid_grid_margin + !blueprint_liquid_grid_width)
 
 =blueprint-liquid-grid
   // A container should group all your columns
@@ -82,7 +82,7 @@
   +clearfix
 
 =span(!n, !override = false)
-  !width = (!blueprint_liquid_grid_width * !n) - ((!blueprint_liquid_grid_width * !n) % 1)
+  !width = (!blueprint_liquid_grid_width * !n) + (!blueprint_liquid_grid_margin * (!n - 1))
   @if !override
     width= !width !important
   @else
@@ -101,10 +101,10 @@
     margin-right= !blueprint_liquid_grid_margin
 
 =append(!n)
-  padding-right= (!blueprint_liquid_grid_width * !n) - ((!blueprint_liquid_grid_width * !n) % 1)
+  padding-right= (!blueprint_liquid_grid_width + !blueprint_liquid_grid_margin) * !n
   
 =prepend(!n)
-  padding-left= (!blueprint_liquid_grid_width * !n) - ((!blueprint_liquid_grid_width * !n) % 1)
+  padding-left= (!blueprint_liquid_grid_width + !blueprint_liquid_grid_margin) * !n
 
 =pull(!n, !last = false)
   margin-left= (!blueprint_liquid_grid_push_pull * !n)
@@ -113,7 +113,7 @@
   +float-right
   margin:
     top: 0
-    left: 1.5em
+    left= !blueprint_liquid_grid_margin
     right= (!blueprint_liquid_grid_push_pull * !n)
     bottom: 0
 
@@ -121,8 +121,8 @@
   border-right: 1px solid #eee
 
 =colborder
-  padding-right: 2%
-  margin-right: 2%
+  padding-right= !blueprint_liquid_grid_margin * 2
+  margin-right= !blueprint_liquid_grid_margin * 2
   +border
 
 =colruler
@@ -131,7 +131,9 @@
   clear: both
   width: 100% 
   height: 0.083em
-  margin: 0 0 1.583em
+  margin: 0
+  margin-left= !blueprint_liquid_grid_margin * 2
+  margin-right= !blueprint_liquid_grid_margin * 2
   border: none
 
 =colspacer

data/frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass

@@ -1,2 +1,2 @@
-@debug "DEPRECATION WARINING: blueprint/modules/buttons.sass has moved to blueprint/buttons.sass"
+@debug "DEPRECATION WARNING: blueprint/modules/buttons.sass has moved to blueprint/buttons.sass"
 @import blueprint/buttons.sass

data/frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass

@@ -1,2 +1,2 @@
-@debug "DEPRECATION WARINING: blueprint/modules/colors.sass has moved to blueprint/colors.sass"
+@debug "DEPRECATION WARNING: blueprint/modules/colors.sass has moved to blueprint/colors.sass"
 @import blueprint/colors.sass

data/frameworks/blueprint/stylesheets/blueprint/modules/_debug.sass

@@ -1,2 +1,2 @@
-@debug "DEPRECATION WARINING: blueprint/modules/debug.sass has moved to blueprint/debug.sass"
+@debug "DEPRECATION WARNING: blueprint/modules/debug.sass has moved to blueprint/debug.sass"
 @import blueprint/debug.sass

data/frameworks/blueprint/stylesheets/blueprint/modules/_fancy_type.sass

@@ -1,2 +1,2 @@
-@debug "DEPRECATION WARINING: blueprint/modules/fancy_type.sass has moved to blueprint/fancy_type.sass"
+@debug "DEPRECATION WARNING: blueprint/modules/fancy_type.sass has moved to blueprint/fancy_type.sass"
 @import blueprint/fancy_type.sass

data/frameworks/blueprint/stylesheets/blueprint/modules/_form.sass

@@ -1,2 +1,2 @@
-@debug "DEPRECATION WARINING: blueprint/modules/form.sass has moved to blueprint/form.sass"
+@debug "DEPRECATION WARNING: blueprint/modules/form.sass has moved to blueprint/form.sass"
 @import blueprint/form.sass

data/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass

@@ -1,2 +1,2 @@
-@debug "DEPRECATION WARINING: blueprint/modules/grid.sass has moved to blueprint/grid.sass"
+@debug "DEPRECATION WARNING: blueprint/modules/grid.sass has moved to blueprint/grid.sass"
 @import blueprint/grid.sass

data/frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass

@@ -1,2 +1,2 @@
-@debug "DEPRECATION WARINING: blueprint/modules/interaction.sass has moved to blueprint/interaction.sass"
+@debug "DEPRECATION WARNING: blueprint/modules/interaction.sass has moved to blueprint/interaction.sass"
 @import blueprint/interaction.sass

data/frameworks/blueprint/stylesheets/blueprint/modules/_link_icons.sass

@@ -1,2 +1,2 @@
-@debug "DEPRECATION WARINING: blueprint/modules/link_icons.sass has moved to blueprint/link_icons.sass"
+@debug "DEPRECATION WARNING: blueprint/modules/link_icons.sass has moved to blueprint/link_icons.sass"
 @import blueprint/link_icons.sass

data/frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass

@@ -1,3 +1,3 @@
-@debug "DEPRECATION WARINING: blueprint/modules/liquid.sass has moved to blueprint/liquid.sass"
+@debug "DEPRECATION WARNING: blueprint/modules/liquid.sass has moved to blueprint/liquid.sass"
 @import blueprint/liquid.sass
 

data/frameworks/blueprint/stylesheets/blueprint/modules/_reset.sass

@@ -1,2 +1,2 @@
-@debug "DEPRECATION WARINING: blueprint/modules/reset.sass has moved to blueprint/reset.sass"
+@debug "DEPRECATION WARNING: blueprint/modules/reset.sass has moved to blueprint/reset.sass"
 @import blueprint/reset.sass

data/frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass

@@ -1,2 +1,2 @@
-@debug "DEPRECATION WARINING: blueprint/modules/rtl.sass has moved to blueprint/rtl.sass"
+@debug "DEPRECATION WARNING: blueprint/modules/rtl.sass has moved to blueprint/rtl.sass"
 @import blueprint/rtl.sass

data/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass

@@ -1,2 +1,2 @@
-@debug "DEPRECATION WARINING: blueprint/modules/scaffolding.sass has moved to blueprint/scaffolding.sass"
+@debug "DEPRECATION WARNING: blueprint/modules/scaffolding.sass has moved to blueprint/scaffolding.sass"
 @import blueprint/scaffolding.sass

data/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass

@@ -1,2 +1,2 @@
-@debug "DEPRECATION WARINING: blueprint/modules/typography.sass has moved to blueprint/typography.sass"
+@debug "DEPRECATION WARNING: blueprint/modules/typography.sass has moved to blueprint/typography.sass"
 @import blueprint/typography.sass

data/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass

@@ -1,2 +1,2 @@
-@debug "DEPRECATION WARINING: blueprint/modules/utilities.sass has moved to blueprint/utilities.sass"
+@debug "DEPRECATION WARNING: blueprint/modules/utilities.sass has moved to blueprint/utilities.sass"
 @import blueprint/utilities.sass

data/frameworks/compass/stylesheets/compass/css3/_gradient.sass

@@ -1,40 +1,58 @@
-=gradient(!type, !coords, !color_start, !color_end, !color_stop = false)
-  !gradient= "#{!coords}, from(#{!color_start}), to(#{!color_end})"
-  @if !color_stop
-    !gradient= !gradient + ", " + !color_stop
-  background: -webkit-gradient(#{!type}, #{!gradient})
-  background: -moz-#{!type}-gradient(#{!gradient})
+// This yields a linear gradient spanning from top to bottom
+//
+//     +linear-gradient(color_stops(white, black))
+//
+// This yields a linear gradient spanning from bottom to top
+//
+//     +linear-gradient(color_stops(white, black), "bottom")
+//
+// This yields a linear gradient spanning from left to right
+//
+//     +linear-gradient(color_stops(white, black), "left")
+//
+// This yields a linear gradient starting at white passing
+// thru blue at 33% down and then to black
+//
+//     +linear-gradient(color_stops(white, blue 33%, black))
+//
+// This yields a linear gradient starting at white passing
+// thru blue at 33% down and then to black at 67% until the end
+//
+//     +linear-gradient(color_stops(white, blue 33%, black 67%))
+//
+// Browsers Supported:
+//
+// - Chrome
+// - Safari
+// - Firefox 3.6
 
-//*
-  // This will yeild a radial gradient with an apparent specular highlight
-  +radial-gradient("45 45, 10, 52 50, 30", Cyan, DodgerBlue)
-    
-=radial-gradient(!coords, !color1, !color2, !color_stop = false)
-  +gradient("radial", !coords, !color1, !color2, !color_stop)
+=linear-gradient(!color_stops, !start = "top")
+  // Firefox's gradient api is nice.
+  // Webkit's gradient api sucks -- hence these backflips:
+  !end = grad_opposite_position(!start)
+  background-image: -webkit-gradient(linear, #{grad_point(!start)}, #{grad_point(!end)}, #{grad_color_stops(!color_stops)})
+  background-image: -moz-linear-gradient(#{!start}, #{!color_stops})
 
-//* 
-  // This yields a linear gradient spanning from !start to !end coordinates
-  +linear-gradient("left top", "left bottom", #fff, #ddd)
+// Due to limitation's of webkit, the radial gradient mixin works best if you use
+// pixel-based color stops.
+// 
+// Examples:
+// 
+//     // Defaults to a centered, 100px radius gradient
+//     +radial-gradient(color_stops(#c00, #00c))
+//     // 100px radius gradient in the top left corner
+//     +radial-gradient(color_stops(#c00, #00c), "top left")
+//     // Three colors, ending at 50px and passing thru #fff at 25px
+//     +radial-gradient(color_stops(#c00, #fff, #00c 50px))
+//
+// Browsers Supported:
+//
+// - Chrome
+// - Safari
+// - Firefox 3.6
 
-=linear-gradient(!start, !end, !color1, !color2, !color_stop = false)
-  !coords = !start + ", " + !end
-  +gradient("linear", !coords, !color1, !color2, !color_stop)
+=radial-gradient(!color_stops, !center_position = "center center")
+  !end_pos = grad_end_position(!color_stops, true)
+  background-image: -webkit-gradient(radial, #{grad_point(!center_position)}, 0, #{grad_point(!center_position)}, #{!end_pos}, #{grad_color_stops(!color_stops)})
+  background-image: -moz-radial-gradient(#{!center_position}, circle, #{!color_stops})
 
-//*
-  // This yields a gradient starting at the top with #fff, ending in #aaa
-  +v-gradient(#fff, #aaa)
-  // Same as above but with a #ccc at the halfway point
-  +v-gradient(#fff, #aaa, color_stop(50%, #ccc))
-  // Same as the first example but with #ccc at the 30% from the top, and #bbb at 70% from the top
-  +v-gradient(#fff, #aaa, color_stop(30%, #ccc, 70%, #bbb))
-
-=v-gradient(!color1, !color2, !color_stop = false)
-  +linear-gradient("left top", "left bottom", !color1, !color2, !color_stop)
-
-//* 
-  // This yields a horizontal linear gradient spanning from left to right
-  // It can be used just like v-gradient above
-  h-gradient(#fff, #ddd)
-  
-=h-gradient(!color1, !color2, !color_stop = false)
-  +linear-gradient("left top", "right top", !color1, !color2, !color_stop)

data/frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass

@@ -7,6 +7,7 @@
   html, body
     height: 100%
   #{!root_selector}
+    clear: both
     min-height: 100%
     height: auto !important
     height: 100%

data/frameworks/compass/stylesheets/compass/utilities/general/_hacks.sass

@@ -5,11 +5,11 @@
   &
     display: block
 
-//**
-  IE6 will let the !important property win
-  While all the other browsers won't.
-  TODO: link to blog post
-=bang-hack(!property, !hack_value, !value)
-  #{!property}: #{!hack_value} !important
-  #{!property}: #{!value}
+//** 
+  A hack to supply IE6 (and below) with a different property value.
+  See http://www.cssportal.com/css-hacks/#in_css-important
+=bang-hack(!property, !value, !ie6_value)
+  #{!property}: #{!value} !important
+  #{!property}: #{!ie6_value}
+
 

data/frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass

@@ -30,6 +30,10 @@
 //**
   Can be mixed into any li selector that is meant to participate in a horizontal layout.
   Used to implement +horizontal-list.
+
+  :last-child is not fully supported
+  see http://www.quirksmode.org/css/contents.html#t29 for the support matrix
+
 =horizontal-list-item(!padding = 4px)
   +no-bullet
   white-space: nowrap
@@ -37,9 +41,9 @@
   padding:
     left= !padding
     right= !padding
-  &.first
+  &:first-child, &.first
     padding-left: 0px
-  &.last
+  &:last-child, &.last
     padding-right: 0px
 
 //**

data/lib/compass.rb

@@ -17,6 +17,6 @@ module Compass
   module_function :base_directory, :lib_directory
 end
 
-%w(configuration frameworks app_integration).each do |lib|
+%w(configuration frameworks app_integration actions compiler).each do |lib|
   require "compass/#{lib}"
 end

data/lib/compass/app_integration/rails.rb

@@ -20,6 +20,12 @@ module Compass
           extend(ConfigurationDefaults)
       end
 
+      def env
+        if rails_env = (defined?(::Rails) ? ::Rails.env : (defined?(RAILS_ENV) ? RAILS_ENV : nil))
+          rails_env.production? ? :production : :development
+        end
+      end
+
     end
   end
 end

data/lib/compass/app_integration/rails/installer.rb

@@ -80,9 +80,12 @@ module Compass
         end
 
         def config_contents
+          "# This configuration file works with both the Compass command line tool and within Rails.\n" +
           Compass.configuration.serialize do |prop, value|
             if prop == :project_path
               "project_path = RAILS_ROOT if defined?(RAILS_ROOT)\n"
+            elsif prop == :environment
+              "environment = Compass::AppIntegration::Rails.env\n"
             elsif prop == :output_style
               ""
             end
@@ -91,11 +94,11 @@ module Compass
 
         def initializer_contents
           %Q{require 'compass'
-  # If you have any compass plugins, require them here.
-  Compass.configuration.parse(File.join(RAILS_ROOT, "config", "compass.rb"))
-  Compass.configuration.environment = (defined?(Rails) ? Rails.env : RAILS_ENV).to_sym
-  Compass.configure_sass_plugin!
-  }
+            |rails_root = (defined?(Rails) ? Rails.root : RAILS_ROOT).to_s
+            |Compass.add_project_configuration(File.join(rails_root, "config", "compass.rb"))
+            |Compass.configure_sass_plugin!
+            |Compass.handle_configuration_change!
+            |}.gsub(/^\s+\|/,'')
         end
 
         def stylesheet_prefix

data/lib/compass/app_integration/rails/runtime.rb

@@ -1,10 +1,14 @@
 unless defined?(Compass::RAILS_LOADED)
   Compass::RAILS_LOADED = true
-
-  %w(action_controller sass_plugin urls).each do |lib|
-    require "compass/app_integration/rails/#{lib}"
+  
+  if ActionPack::VERSION::MAJOR >= 3
+    # figure something out so image_path works with rails integration
+  else
+    %w(action_controller sass_plugin urls).each do |lib|
+      require "compass/app_integration/rails/actionpack2/#{lib}"
+    end
   end
-
+  
   # Wierd that this has to be re-included to pick up sub-modules. Ruby bug?
   class Sass::Script::Functions::EvaluationContext
     include Sass::Script::Functions

data/lib/compass/commands/installer_command.rb

@@ -12,9 +12,7 @@ module Compass
           Compass.add_project_configuration(:project_type => options.delete(:project_type))
         end
         Compass.add_configuration(options, 'command_line')
-        if File.exists?(Compass.configuration.extensions_path)
-          Compass::Frameworks.discover(Compass.configuration.extensions_path)
-        end
+        Compass.discover_extensions!
         Compass.add_configuration(installer.completed_configuration, 'installer')
       end
 

data/lib/compass/commands/project_base.rb

@@ -23,9 +23,7 @@ module Compass
 
       def configure!
         add_project_configuration
-        if File.exists?(Compass.configuration.extensions_path)
-          Compass::Frameworks.discover(Compass.configuration.extensions_path)
-        end
+        Compass.discover_extensions!
       end
 
       def add_project_configuration

data/lib/compass/commands/write_configuration.rb

@@ -59,8 +59,11 @@ module Compass
             end
           end
         else
-          directory File.dirname(options[:configuration_file])
-          installer.write_configuration_files(options[:configuration_file])
+          config_file = options[:configuration_file]
+          config_file ||= Compass.detect_configuration_file
+          config_file ||= Compass::Configuration::Helpers::KNOWN_CONFIG_LOCATIONS.first
+          directory File.dirname(config_file)
+          installer.write_configuration_files(config_file)
         end
       end
 

data/lib/compass/compiler.rb

@@ -58,6 +58,13 @@ module Compass
       nil
     end
 
+    def clean!
+      FileUtils.rm_rf options[:cache_location]
+      css_files.each do |css_file|
+        FileUtils.rm_f css_file
+      end
+    end
+
     def run
       if new_config?
         # Wipe out the cache and force compilation if the configuration has changed.

data/lib/compass/configuration/adapters.rb

@@ -3,7 +3,7 @@ module Compass
     # The adapters module provides methods that make configuration data from a compass project
     # adapt to various consumers of configuration data
     module Adapters
-      def to_compiler_arguments(additional_options)
+      def to_compiler_arguments(additional_options = {})
         [project_path, sass_path, css_path, to_sass_engine_options.merge(additional_options)]
       end
 
@@ -19,8 +19,8 @@ module Compass
         plugin_opts = {:template_location => locations}
         plugin_opts[:style] = output_style if output_style
         plugin_opts[:line_comments] = line_comments
-        plugin_opts[:cache] = cache
-        plugin_opts[:cache_location] = cache_path
+        plugin_opts[:cache] = cache unless cache.nil?
+        plugin_opts[:cache_location] = cache_path unless cache_path.nil?
         plugin_opts.merge!(sass_options || {})
         plugin_opts
       end

data/lib/compass/configuration/defaults.rb

@@ -2,6 +2,10 @@ module Compass
   module Configuration
     module Defaults
 
+      def default_project_path
+        "."
+      end
+
       def default_project_type
         :stand_alone
       end