compass-core 1.0.0.alpha.13 → 1.0.0.alpha.14

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha.12
+1.0.0.alpha.13

data/lib/compass/configuration.rb

@@ -36,7 +36,7 @@ module Compass
         Data.send(:define_method, :"default_#{name}", &default) if default
         Data.inherited_accessor(name)
         if name.to_s =~ /dir|path/
-          strip_trailing_separator(name)
+          Data.strip_trailing_separator(name)
         end
       end
 

data/lib/compass/core/sass_extensions/functions/display.rb

@@ -2,7 +2,7 @@ module Compass::Core::SassExtensions::Functions::Display
   DEFAULT_DISPLAY = {
                  "block" => %w{address article aside blockquote center dir div dd details dl dt fieldset
                                figcaption figure form footer frameset h1 h2 h3 h4 h5 h6 hr header hgroup
-                               isindex menu nav noframes noscript ol p pre section summary ul},
+                               isindex main menu nav noframes noscript ol p pre section summary ul},
                 "inline" => %w{a abbr acronym audio b basefont bdo big br canvas cite code command
                                datalist dfn em embed font i img input keygen kbd label mark meter output
                                progress q rp rt ruby s samp select small span strike strong sub
@@ -15,7 +15,7 @@ module Compass::Core::SassExtensions::Functions::Display
     "table-footer-group" => %w{tfoot},
              "table-row" => %w{tr},
             "table-cell" => %w{th td},
-           "html5-block" => %w{article aside details figcaption figure footer header hgroup menu nav
+           "html5-block" => %w{article aside details figcaption figure footer header hgroup main menu nav
                                section summary},
           "html5-inline" => %w{audio canvas command datalist embed keygen mark meter output progress rp
                                rt ruby time video wbr},

data/lib/compass/core/sass_extensions/functions/font_files.rb

@@ -9,33 +9,55 @@ module Compass::Core::SassExtensions::Functions::FontFiles
     :eot => 'embedded-opentype'
   }
 
+  def font_formats(*args)
+    formats = []
+    with_each_font_file(*args) do |path, type|
+      formats << Sass::Script::String.new(type)
+    end
+    return Sass::Script::List.new(formats, :comma)
+  end
+
   def font_files(*args)
     files = []
-    args_length = args.length
+    with_each_font_file(*args) do |path, type|
+      files << "#{font_url(path)} format('#{type}')"
+    end
+    Sass::Script::String.new(files.join(", "))
+  end
+
+protected
+  def with_each_font_file(*args)
     skip_next = false
 
-    args.each_with_index do |arg, index|
+    args.each_with_index do |path, index|
+      assert_type path, :String
+      path = unquote(path)
+      # if we were told to skip this iteration, do so...
       if skip_next
         skip_next = false
         next
       end
 
-      type = (args_length > (index + 1)) ? args[index + 1].value.to_sym : :wrong
+      # back-compat support for passing the font type e.g.
+      # font-files('path/to/file.ttf', truetype, 'path/to/file.otf', opentype);
+      type = args[index + 1]
+      type = type.nil? ? :wrong : type.value.to_sym
 
+      # if the type is valid, keep it, and skip the next index (as it was the type)
       if FONT_TYPES.key? type
         skip_next = true
+      # otherwise, we need to look at the file extension to derive the type...
       else
         # let pass url like font.type?thing#stuff
-        type = arg.to_s.split('.').last.gsub(/(\?(.*))?(#(.*))?"/, '').to_sym
+        type = path.to_s.split('.').last.gsub(/(\?(.*))?(#(.*))?\"?/, '').to_sym
       end
 
       if FONT_TYPES.key? type
-        files << "#{font_url(arg)} format('#{FONT_TYPES[type]}')"
+        yield(path, FONT_TYPES[type]) if block_given?
       else
-        raise Sass::SyntaxError, "Could not determine font type for #{arg}"
+        raise Sass::SyntaxError, "Could not determine font type for #{path}"
       end
     end
-
-    Sass::Script::String.new(files.join(", "))
   end
+
 end

data/lib/compass/core/sass_extensions/functions/gradient_support.rb

@@ -555,7 +555,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     end
 
     def radial_svg(color_stops, cx, cy, r)
-      gradient = %Q{<radialGradient id="grad" gradientUnits="userSpaceOnUse" cx="#{cx}" cy="#{cy}" r="#{r}">#{color_stops_svg(color_stops)}</radialGradient>}
+      gradient = %Q{<radialGradient id="grad" gradientUnits="userSpaceOnUse" cx="#{cx}" cy="#{cy}" r="#{r}%">#{color_stops_svg(color_stops)}</radialGradient>}
       svg(gradient)
     end
 

data/lib/compass/core/sass_extensions/functions/inline_image.rb

@@ -7,13 +7,12 @@ module Compass::Core::SassExtensions::Functions::InlineImage
   end
 
   def inline_font_files(*args)
-    raise Sass::SyntaxError, "An even number of arguments must be passed to font_files()" unless args.size % 2 == 0
     files = []
-    while args.size > 0
-      path = args.shift.value
+    with_each_font_file(*args) do |path, type|
+      path = path.value
       real_path = File.join(Compass.configuration.fonts_path, path)
-      url = inline_image_string(data(real_path), compute_mime_type(path))
-      files << "#{url} format('#{args.shift}')"
+      data = inline_image_string(data(real_path), compute_mime_type(path))
+      files << "#{data} format('#{type}')"
     end
     Sass::Script::String.new(files.join(", "))
   end
@@ -27,7 +26,7 @@ protected
 
 private
   def compute_mime_type(path, mime_type = nil)
-    return mime_type if mime_type
+    return mime_type.value if mime_type
     case path
     when /\.png$/i
       'image/png'
@@ -44,7 +43,7 @@ private
     when /\.ttf$/i
       'font/truetype'
     when /\.woff$/i
-      'application/x-font-woff'
+      'application/font-woff'
     when /\.off$/i
       'font/openfont'
     when /\.([a-zA-Z]+)$/

data/lib/compass/core/sass_extensions/functions/urls.rb

@@ -47,7 +47,7 @@ module Compass::Core::SassExtensions::Functions::Urls
         base.declare :font_url,       [:path, :only_path, :cache_buster]
       end
     end
-    def font_url(path, only_path = Sass::Script::Bool.new(false), cache_buster = Sass::Script::Bool.new(false))
+    def font_url(path, only_path = Sass::Script::Bool.new(false), cache_buster = Sass::Script::Bool.new(true))
       path = path.value # get to the string value of the literal.
 
       # Short curcuit if they have provided an absolute url.
@@ -65,7 +65,7 @@ module Compass::Core::SassExtensions::Functions::Urls
 
       # Compute the real path to the font on the file system if the fonts_dir is set.
       real_path = if Compass.configuration.fonts_dir
-        File.join(Compass.configuration.project_path, Compass.configuration.fonts_dir, path)
+        File.join(Compass.configuration.fonts_path, path.gsub(/#.*$/,""))
       end
 
       # prepend the path to the font if there's one
@@ -81,11 +81,13 @@ module Compass::Core::SassExtensions::Functions::Urls
 
       # Compute and append the cache buster if there is one.
       if cache_buster.to_bool
+        path, anchor = path.split("#", 2)
         if cache_buster.is_a?(Sass::Script::String)
           path += "?#{cache_buster.value}"
         else
           path = cache_busted_path(path, real_path)
         end
+        path = "#{path}#{"#" if anchor}#{anchor}"
       end
 
       # prepend the asset host if there is one.
@@ -131,9 +133,9 @@ module Compass::Core::SassExtensions::Functions::Urls
 
       # Compute the real path to the image on the file stystem if the images_dir is set.
       real_path = if Compass.configuration.images_path
-        File.join(Compass.configuration.images_path, path)
+        File.join(Compass.configuration.images_path, path.gsub(/#.*$/,""))
       else
-        File.join(Compass.configuration.project_path, path)
+        File.join(Compass.configuration.project_path, path.gsub(/#.*$/,""))
       end
 
       # prepend the path to the image if there's one
@@ -149,11 +151,13 @@ module Compass::Core::SassExtensions::Functions::Urls
 
       # Compute and append the cache buster if there is one.
       if cache_buster.to_bool
+        path, anchor = path.split("#", 2)
         if cache_buster.is_a?(Sass::Script::String)
           path += "?#{cache_buster.value}"
         else
           path = cache_busted_path(path, real_path)
         end
+        path = "#{path}#{"#" if anchor}#{anchor}"
       end
 
       # prepend the asset host if there is one.
@@ -198,9 +202,9 @@ module Compass::Core::SassExtensions::Functions::Urls
 
       # Compute the real path to the image on the file stystem if the generated_images_dir is set.
       real_path = if Compass.configuration.images_path
-        File.join(Compass.configuration.images_path, path)
+        File.join(Compass.configuration.images_path, path.gsub(/#.*$/,""))
       else
-        File.join(Compass.configuration.project_path, path)
+        File.join(Compass.configuration.project_path, path.gsub(/#.*$/,""))
       end
 
       # prepend the path to the image if there's one
@@ -216,11 +220,13 @@ module Compass::Core::SassExtensions::Functions::Urls
 
       # Compute and append the cache buster if there is one.
       if cache_buster.to_bool
+        path, anchor = path.split("#", 2)
         if cache_buster.is_a?(Sass::Script::String)
           path += "?#{cache_buster.value}"
         else
           path = cache_busted_path(path, real_path)
         end
+        path = "#{path}#{"#" if anchor}#{anchor}"
       end
 
       # prepend the asset host if there is one.
@@ -275,15 +281,23 @@ module Compass::Core::SassExtensions::Functions::Urls
   end
 
   def compute_cache_buster(path, real_path)
+    file = nil
     if Compass.configuration.asset_cache_buster
       args = [path]
       if Compass.configuration.asset_cache_buster.arity > 1
-        args << (File.new(real_path) if real_path)
+        begin
+          file = File.new(real_path) if real_path
+        rescue Errno::ENOENT
+          # pass
+        end
+        args << file
       end
       Compass.configuration.asset_cache_buster.call(*args)
     elsif real_path
       default_cache_buster(path, real_path)
     end
+  ensure
+    file.close if file
   end
 
   def default_cache_buster(path, real_path)

data/stylesheets/compass/css3/_box-sizing.scss

@@ -6,10 +6,16 @@
 // Defaults to the $graceful-usage-threshold.
 $box-sizing-support-threshold: $critical-usage-threshold !default;
 
+// The default box-sizing model when no argument is provided to the box-sizing mixin: [ content-box | border-box | padding-box ]
+//
+// The browser default is content-box, compass defaults to border-box.
+$default-box-sizing: border-box !default;
+
+
 // Change the box model for Mozilla, Webkit, IE8 and the future
 //
 //     $box-model: [ content-box | border-box | padding-box ]
-@mixin box-sizing($box-model) {
+@mixin box-sizing($box-model: $default-box-sizing) {
   $box-model: unquote($box-model);
   @include prefixed-properties(css3-boxsizing, $box-sizing-support-threshold, (box-sizing: $box-model));
 }

data/stylesheets/compass/css3/_opacity.scss

@@ -11,7 +11,11 @@ $opacity-usage-threshold: $graceful-usage-threshold !default;
 
 @mixin opacity($opacity) {
   @include for-legacy-browser("ie", "8", $threshold: $opacity-usage-threshold) {
-    filter: unquote("progid:DXImageTransform.Microsoft.Alpha(Opacity=#{round($opacity * 100)})");
+    @if $opacity == 1 {
+      filter: unquote("progid:DXImageTransform.Microsoft.Alpha(enabled=false)");
+    } @else {
+      filter: unquote("progid:DXImageTransform.Microsoft.Alpha(Opacity=#{round($opacity * 100)})");
+    }
   }
   opacity: $opacity;
 }

data/stylesheets/compass/css3/_transition.scss

@@ -118,13 +118,13 @@ $transitionable-prefixed-values: transform, transform-origin !default;
 }
 
 @mixin transition($transitions...) {
-  $default: compact($default-transition-property $default-transition-duration $default-transition-function $default-transition-delay);
+  $default: (compact($default-transition-property $default-transition-duration $default-transition-function $default-transition-delay),);
   $transitions: set-arglist-default($transitions, $default);
 
   @include with-each-prefix(css-transitions, $transition-support-threshold) {
-    $delays: ();
-    $transitions-without-delays: ();
-    $transitions-with-delays: ();
+    $delays: comma-list();
+    $transitions-without-delays: comma-list();
+    $transitions-with-delays: comma-list();
     $has-delays: false;
 
 

data/stylesheets/compass/layout/_grid-background.scss

@@ -68,7 +68,7 @@ $grid-background-force-fluid      : false                       !default;
     }
 
     // and we add this column/gutter pair to our grid
-    $grid: join($grid, ($column-color $a, $column-color $g, $gutter-color $g, $gutter-color $z));
+    $grid: join($grid, (lighten($column-color, 5%) $a, darken($column-color, 5%) $g, $gutter-color $g, $gutter-color $z));
   }
 
   @return $grid;

data/stylesheets/compass/typography/_units.scss

@@ -143,7 +143,7 @@ $rem-with-px-fallback: true !default;
 	}
 
 	// Use pixel fallback for browsers that don't understand rem units.
-	@if $use-px-fallback {
+	@if $use-px-fallback and $px-values != $rem-values {
 		#{$property}: $px-values;
 	}
 

data/stylesheets/compass/typography/_vertical_rhythm.scss

@@ -137,7 +137,7 @@ $relative-font-sizing: if($rhythm-unit == px, false, true);
     background: image-url($img);
   }
   @else {
-    @include baseline-grid-background(rhythm());
+    @include baseline-grid-background(if($round-to-nearest-half-line, rhythm(1/2), rhythm(1)));
   }
 }
 

data/stylesheets/compass/typography/text/_replacement.scss

@@ -1,3 +1,5 @@
+@import "compass/support";
+
 // Indicates the direction you prefer to move your text
 // when hiding it.
 //
@@ -56,6 +58,10 @@ $hide-text-direction: left !default;
     white-space: nowrap;
     overflow: hidden;
   }
+  @include for-legacy-browsers((ie: "7"), $critical-usage-threshold) {
+    //Text transform capitalize fixes text-replacement issue when used in a <button> element on ie7
+    text-transform:capitalize;
+  }
 }
 
 // Hides text in an element by squishing the text into oblivion.

metadata

@@ -1,80 +1,95 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: compass-core
-version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.13
+version: !ruby/object:Gem::Version 
+  hash: 1962072037
+  prerelease: 6
+  segments: 
+  - 1
+  - 0
+  - 0
+  - alpha
+  - 14
+  version: 1.0.0.alpha.14
 platform: ruby
-authors:
+authors: 
 - Chris Eppstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
+
+date: 2013-12-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: -23480560
+        segments: 
+        - 3
+        - 3
+        - rc
+        - 1
         version: 3.3.rc.1
-  type: :runtime
+  name: sass
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.3.rc.1
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
   type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  name: multi_json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: The Compass core stylesheet library and minimum required ruby extensions.
-  This library can be used stand-alone without the compass ruby configuration file
-  or compass command line tools.
-email:
+  type: :development
+  requirement: *id004
+description: The Compass core stylesheet library and minimum required ruby extensions. This library can be used stand-alone without the compass ruby configuration file or compass command line tools.
+email: 
 - chris@eppsteins.net
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - data/caniuse.json
 - data/caniuse_extras/css-placeholder.json
 - lib/compass-core.rb
@@ -215,27 +230,39 @@ files:
 - VERSION
 - LICENSE.txt
 homepage: http://compass-style.org/reference/compass/
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>'
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.15
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: The Compass core stylesheet library
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 246b011e8fd01cd10372aa322e905d2ec3e39078
-  data.tar.gz: 78589762eea944050aeb2adf62816f5a9edfacc0
-SHA512:
-  metadata.gz: 39562ece95cdd316d843b2ffdfd23ea1d243ca45db291bf9eded4a0061c848329ff0607636aa68e290e1b239164d1585dcd565e5758400216900656932591ca1
-  data.tar.gz: 8a0380cadabfe9939982b2ea02e9a336b9bf8b224e68920ac8dd59f44e9d21b5a7da79a5e01fe68cc6b4cf69723c6b4592bd8db4211f1afa94054d2b2757d9e4