compass 0.11.alpha.4 → 0.11.beta.0

data/frameworks/blueprint/stylesheets/blueprint/_grid.scss

@@ -54,15 +54,15 @@ $blueprint-container-size: $blueprint-grid-outer-width * $blueprint-grid-columns
   @for $n from 1 to $blueprint-grid-columns {
     .span-#{$n} {
       @extend .column;
-      @include span($n); } }
+      width: span($n); } }
   .span-#{$blueprint-grid-columns} {
     @extend .column;
-    @include span($blueprint-grid-columns);
+    width: span($blueprint-grid-columns);
     margin: 0; }
   input, textarea, select {
     @for $n from 1 through $blueprint-grid-columns {
       &.span-#{$n} {
-        @include span($n, true); } } }
+        width: span($n); } } }
   // Add these to a column to append empty cols.
   @for $n from 1 to $blueprint-grid-columns {
     .append-#{$n} {
@@ -106,18 +106,25 @@ $blueprint-container-size: $blueprint-grid-outer-width * $blueprint-grid-columns
 // Use this mixins to set the width of n columns.
 @mixin column($n, $last: false) {
   @include column-base($last);
-  @include span($n); }
+  width: span($n); }
+
+// Return the width in pixels of `$n` columns.
+@function span($n) {
+  @return $blueprint-grid-width * $n + $blueprint-grid-margin * ($n - 1);
+}
 
 // Set only the width of an element to align it with the grid.
 // Most of the time you'll want to use `+column` instead.
 //
 // This mixin is especially useful for aligning tables to the grid.
-@mixin span($n, $override: false) {
-  $width: $blueprint-grid-width * $n + $blueprint-grid-margin * ($n - 1);
-  @if $override {
-    width: $width !important; }
+//
+// @deprecated Please use the span function with the width property instead.
+@mixin span($n, $important: false) {
+  @warn "The span mixin is deprecated. Please use the span function instead. E.g. width: span(#{$n})";
+  @if $important {
+    width: span($n) !important; }
   @else {
-    width: $width; } }
+    width: span($n); } }
 
 // The basic set of styles needed to make an element
 // behave like a column:

data/frameworks/blueprint/stylesheets/blueprint/_liquid.scss

@@ -55,8 +55,7 @@ $blueprint-liquid-grid-push-pull: -($blueprint-liquid-grid-margin + $blueprint-l
     @include container; }
   // Use these classes (or mixins) to set the width of a column.
   @for $n from 1 to $blueprint-liquid-grid-columns + 1 {
-    .span-#{$n} {
-      @include span($n); }
+    .span-#{$n} { width: span-fluid($n); }
     div {
       &.span-#{$n} {
         @include column($n, $n == $blueprint-liquid-grid-columns); } } }
@@ -86,9 +85,15 @@ $blueprint-liquid-grid-push-pull: -($blueprint-liquid-grid-margin + $blueprint-l
   margin: 0 auto;
   @include clearfix; }
 
-@mixin span($n, $override: false) {
-  $width: $blueprint-liquid-grid-width * $n + $blueprint-liquid-grid-margin * ($n - 1);
-  @if $override {
+// Return the width of `$n` columns in percents.
+@function span-fluid($n) {
+  @return $blueprint-liquid-grid-width * $n + $blueprint-liquid-grid-margin * ($n - 1);
+}
+
+@mixin span($n, $important: false) {
+  @warn "The span mixin is deprecated. Please use the span-fluid function instead. E.g. width: span-fluid(#{$n})";
+  $width: span-fluid($n);
+  @if $important {
     width: $width !important; }
   @else {
     width: $width; } }
@@ -99,7 +104,7 @@ $blueprint-liquid-grid-push-pull: -($blueprint-liquid-grid-margin + $blueprint-l
 @mixin column($n, $last: false) {
   @include float-left;
   overflow: hidden;
-  @include span($n);
+  width: span-fluid($n);
   @if $last {
     @include last; }
   @else {

data/frameworks/compass/stylesheets/compass/_support.scss

@@ -1,17 +1,20 @@
 // Usually compass hacks apply to both ie6 & 7 -- set this to false to disable support for both.
 $legacy-support-for-ie: true !default;
 
-// Setting this to false will result in smaller output, but no support for ie6
+// Setting this to false will result in smaller output, but no support for ie6 hacks
 $legacy-support-for-ie6: $legacy-support-for-ie !default;
 
-// Setting this to false will result in smaller output, but no support for ie7
+// Setting this to false will result in smaller output, but no support for ie7 hacks
 $legacy-support-for-ie7: $legacy-support-for-ie !default;
 
+// Setting this to false will result in smaller output, but no support for legacy ie8 hacks
+$legacy-support-for-ie8: $legacy-support-for-ie !default;
+
 // @private
-// The user can simply set $legacy-support-for-ie and 6 & 7 will be set accordingly,
-// But in case the user set either of those explicitly, we need to sync the value of
+// The user can simply set $legacy-support-for-ie and 6, 7, and 8 will be set accordingly,
+// But in case the user set each of those explicitly, we need to sync the value of
 // this combined variable.
-$legacy-support-for-ie: $legacy-support-for-ie6 or $legacy-support-for-ie7;
+$legacy-support-for-ie: $legacy-support-for-ie6 or $legacy-support-for-ie7 or $legacy-support-for-ie8;
 
 // Support for mozilla in experimental css3 properties.
 $experimental-support-for-mozilla   : true !default;

data/frameworks/compass/stylesheets/compass/css3/_images.scss

@@ -54,8 +54,12 @@
 @mixin filter-gradient($start-color, $end-color, $orientation: vertical) {
   @include has-layout;
   $gradient-type: if($orientation == vertical, 0, 1);
-  filter: progid:DXImageTransform.Microsoft.gradient(gradientType=#{$gradient-type}, startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}');
-  -ms-filter: "progid:DXImageTransform.Microsoft.gradient(gradientType=#{$gradient-type}, startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}')";
+  @if $legacy-support-for-ie8 {
+    -ms-filter: "progid:DXImageTransform.Microsoft.gradient(gradientType=#{$gradient-type}, startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}')";
+  }
+  @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+    filter: progid:DXImageTransform.Microsoft.gradient(gradientType=#{$gradient-type}, startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}');
+  }
 }
 
 

data/frameworks/compass/stylesheets/compass/css3/_opacity.scss

@@ -6,18 +6,13 @@
 //         A number between 0 and 1, where 0 is transparent and 1 is opaque.
 
 @mixin opacity($opacity) {
-  opacity: $opacity;
-  @if $experimental-support-for-microsoft {
-    $value: unquote("progid:DXImageTransform.Microsoft.Alpha(Opacity=#{round($opacity * 100)})");
-    @include experimental(filter, $value,
-      not -moz,
-      not -webkit,
-      not -o,
-      -ms,
-      not -khtml,
-      official // even though filter is not an official css3 property, IE 6/7 expect it.
-    );
+  @if $legacy-support-for-ie8 {
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=#{round($opacity * 100)})";
+  }
+  @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+    filter: unquote("progid:DXImageTransform.Microsoft.Alpha(Opacity=#{round($opacity * 100)})");
   }
+  opacity: $opacity;
 }
 
 // Make an element completely transparent.

data/frameworks/compass/stylesheets/compass/css3/_transform.scss

@@ -47,31 +47,45 @@
 // Defaults ------------------------------------------------------------------
 // @doc on
 
-// Transform Origin
+// The default x-origin for transforms
 $default-origin-x    : 50%                   !default;
+// The default y-origin for transforms
 $default-origin-y    : 50%                   !default;
+// The default z-origin for transforms
 $default-origin-z    : 50%                   !default;
 
-// Scale
+
+// The default x-multiplier for scaling
 $default-scale-x     : 1.25                  !default;
+// The default y-multiplier for scaling
 $default-scale-y     : $default-scale-x      !default;
+// The default z-multiplier for scaling
 $default-scale-z     : $default-scale-x      !default;
 
-// Rotate
+
+// The default angle for rotations
 $default-rotate      : 45deg                 !default;
 
-// Rotate3d
+
+// The default x-vector for the axis of 3d rotations
 $default-vector-x    : 1                     !default;
+// The default y-vector for the axis of 3d rotations
 $default-vector-y    : 1                     !default;
+// The default z-vector for the axis of 3d rotations
 $default-vector-z    : 1                     !default;
 
-// Translate
+
+// The default x-length for translations
 $default-translate-x : 1em                   !default;
+// The default y-length for translations
 $default-translate-y : $default-translate-x  !default;
+// The default z-length for translations
 $default-translate-z : $default-translate-x  !default;
 
-// Skew
+
+// The default x-angle for skewing
 $default-skew-x      : 5deg                  !default;
+// The default y-angle for skewing
 $default-skew-y      : 5deg                  !default;
 
 

data/frameworks/compass/stylesheets/compass/utilities/sprites/_base.scss

@@ -30,9 +30,10 @@
 // If a base class is provided, then each class will extend it.
 //
 // If `$dimensions` is `true`, the sprite dimensions will specified.
-@mixin sprites($map, $sprite-names, $base-class: false, $dimensions: false) {
+@mixin sprites($map, $sprite-names, $base-class: false, $dimensions: false, $prefix: sprite-map-name($map)) {
   @each $sprite-name in $sprite-names {
-    .#{sprite-map-name($map)}-#{$sprite-name} {
+    $full-sprite-name: if($prefix and $prefix != "", "#{$prefix}-#{$sprite-name}", $sprite-name);
+    .#{$full-sprite-name} {
       @if $base-class { @extend #{$base-class}; }
       @include sprite($map, $sprite-name, $dimensions);
     }

data/lib/compass.rb

@@ -1,7 +1,7 @@
 module Compass
 end
 
-%w(dependencies util sass_extensions core_ext version errors quick_cache).each do |lib|
+%w(dependencies util browser_support sass_extensions core_ext version errors quick_cache).each do |lib|
   require "compass/#{lib}"
 end
 

data/lib/compass/app_integration/rails.rb

@@ -34,9 +34,9 @@ module Compass
         end
       end
 
-      def initialize!
-        config_file = Compass.detect_configuration_file(root)
-        Compass.add_project_configuration(config_file)
+      def initialize!(config = nil)
+        config ||= Compass.detect_configuration_file(root)
+        Compass.add_project_configuration(config, :project_type => :rails)
         Compass.discover_extensions!
         Compass.configure_sass_plugin!
         Compass.handle_configuration_change!

data/lib/compass/app_integration/rails/actionpack2/urls.rb

@@ -1,5 +1,5 @@
 module Compass::SassExtensions::Functions::Urls
-  def image_url_with_rails_integration(path, only_path = Sass::Script::Bool.new(false))
+  def image_url_with_rails_integration(path, only_path = Sass::Script::Bool.new(false), cache_buster = Sass::Script::Bool.new(true))
     if (@controller = Sass::Plugin.rails_controller) && @controller.respond_to?(:request) && @controller.request
       begin
         if only_path.to_bool
@@ -11,7 +11,7 @@ module Compass::SassExtensions::Functions::Urls
         @controller = nil
       end
     else
-      image_url_without_rails_integration(path)
+      image_url_without_rails_integration(path, only_path, cache_buster)
     end
   end
   alias_method_chain :image_url, :rails_integration

data/lib/compass/app_integration/rails/actionpack3/railtie.rb

@@ -1,18 +1,46 @@
 require 'compass'
 require 'rails'
-module Compass
-  class Railtie < Rails::Railtie
-    config.to_prepare do
-      # putting this here allows compass to detect
-      # and adjust to changes to the project configuration
-      Compass.reset_configuration!
-      Compass::AppIntegration::Rails.initialize!
+
+class Rails::Railtie::Configuration
+  # Adds compass configuration accessor to the application configuration.
+  #
+  # If a configuration file for compass exists, it will be read in and
+  # the project's configuration values will already be set on the config
+  # object.
+  #
+  # For example:
+  #
+  #     module MyApp
+  #       class Application < Rails::Application
+  #          config.compass.line_comments = !Rails.env.production?
+  #          config.compass.fonts_dir = "app/assets/fonts"
+  #       end
+  #     end
+  #
+  # It is suggested that you create a compass configuration file if you
+  # want a quicker boot time when using the compass command line tool.
+  #
+  # For more information on available configuration options see:
+  # http://compass-style.org/help/tutorials/configuration-reference/
+  def compass
+    @compass ||= begin
+      data = if (config_file = Compass.detect_configuration_file) && (config_data = Compass.configuration_for(config_file))
+        config_data
+      else
+        Compass::Configuration::Data.new("project")
+      end
+      data.project_type = :rails # Forcing this makes sure all the rails defaults will be loaded.
+      data
     end
+  end
+end
 
-    initializer "compass/railtie.configure_rails_initialization" do |app|
-      # XXX How do I only do this if it's not done yet?
-      # require 'sass/plugin/rack'
-      # app.middleware.use Sass::Plugin::Rack
+module Compass
+  class Railtie < Rails::Railtie
+    initializer "compass.initialize_rails" do |app|
+      # Configure compass for use within rails, and provide the project configuration
+      # that came via the rails boot process.
+      Compass::AppIntegration::Rails.initialize!(app.config.compass)
     end
   end
 end

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

@@ -8,9 +8,11 @@ module Compass
         end
 
         def default_sass_dir
-          # XXX Maybe this should be: app/views/stylesheets
-          # or maybe layouts should be moved up a level.
-          File.join("app", "stylesheets")
+          if Sass::Util.ap_geq?('3.1.0.beta')
+            File.join("app", "assets", "stylesheets")
+          else
+            File.join("app", "stylesheets")
+          end
         end
 
         def default_css_dir
@@ -26,23 +28,27 @@ module Compass
         end
 
         def default_javascripts_dir
-          File.join("public", "javascripts")
+          if Sass::Util.ap_geq?('3.1.0.beta')
+            File.join("app", "assets", "javascripts")
+          else
+            File.join("public", "javascripts")
+          end
         end
 
         def default_http_images_path
-          "/images"
+          "#{top_level.http_path}images"
         end
 
         def default_http_javascripts_path
-          "/javascripts"
+          "#{top_level.http_path}javascripts"
         end
 
         def default_http_fonts_path
-          "/fonts"
+          "#{top_level.http_path}fonts"
         end
 
         def default_http_stylesheets_path
-          "/stylesheets"
+          "#{top_level.http_path}stylesheets"
         end
 
         def default_extensions_dir

data/lib/compass/browser_support.rb

@@ -0,0 +1,62 @@
+module Compass
+  module BrowserSupport
+    extend self
+
+    ASPECTS = %w(webkit moz o ms svg pie css2)
+
+    SIMPLE_FUNCTIONS = {
+           "image" => %w(), # No browsers implement this yet.
+      "cross-fade" => %w()  # No browsers implement this yet.
+    }
+
+    # Adds support for one or more aspects for the given simple function
+    # Example:
+    #
+    #   Compass::BrowserSupport.add_support("image", "moz", "webkit")
+    #   # => Adds support for moz and webkit to the image() function.
+    #
+    # This function can be called one or more times in a compass configuration
+    # file in order to add support for new, simple browser functions without
+    # waiting for a new compass release.
+    def add_support(function, *aspects)
+      aspects.each do |aspect|
+        unless ASPECTS.include?(aspect)
+          Compass::Util.compass_warn "Unknown support aspect: #{aspect}"
+          next
+        end
+        unless supports?(function, aspect)
+          SIMPLE_FUNCTIONS[function.to_s] ||= []
+          SIMPLE_FUNCTIONS[function.to_s] << aspect.to_s
+        end
+      end
+    end
+
+    # Removes support for one or more aspects for the given simple function
+    # Example:
+    #
+    #   Compass::BrowserSupport.remove_support("image", "o", "ms")
+    #   # => Adds support for moz and webkit to the image() function.
+    #
+    # This function can be called one or more times in a compass configuration
+    # file in order to remove support for simple functions that no longer need to
+    # a prefix without waiting for a new compass release.
+    def remove_support(function, *aspects)
+      aspects.each do |aspect|
+        unless ASPECTS.include?(aspect)
+          Compass::Util.compass_warn "Unknown support aspect: #{aspect}"
+          next
+        end
+        SIMPLE_FUNCTIONS[function.to_s].reject!{|a| a == aspect.to_s}
+      end
+    end
+
+    def supports?(function, aspect)
+      SIMPLE_FUNCTIONS.has_key?(function.to_s) && SIMPLE_FUNCTIONS[function.to_s].include?(aspect.to_s)
+    end
+
+    def has_aspect?(function)
+      SIMPLE_FUNCTIONS.has_key?(function.to_s) && SIMPLE_FUNCTIONS[function.to_s].size > 0
+    end
+
+  end
+end

data/lib/compass/commands/print_version.rb

@@ -54,6 +54,15 @@ Options:
           parser.parse!
           parser.options
         end
+        def long_output_string
+          lines = []
+          lines << "Compass #{::Compass.version[:string]}"
+          lines << "Copyright (c) 2008-#{Time.now.year} Chris Eppstein"
+          lines << "Released under the MIT License."
+          lines << "Compass is charityware."
+          lines << "Please make a tax deductable donation for a worthy cause: http://umdf.org/compass"
+          lines.join("\n")
+        end
       end
 
       attr_accessor :options
@@ -79,13 +88,7 @@ Options:
         elsif options[:quiet]
           puts ::Compass.version[:string]
         else
-          lines = []
-          lines << "Compass #{::Compass.version[:string]}"
-          lines << "Copyright (c) 2008-#{Time.now.year} Chris Eppstein"
-          lines << "Released under the MIT License."
-          lines << "Compass is charityware."
-          lines << "Please make a tax deductable donation: http://umdf.org/compass"
-          puts lines.join("\n")
+          puts self.class.long_output_string
         end
       end
     end