diff --git a/VERSION.yml b/VERSION.yml index 0ffe9867..efa69d5f 100644 --- a/VERSION.yml +++ b/VERSION.yml @@ -2,5 +2,5 @@ :major: 0 :minor: 12 :state: alpha -:build: 3 +:build: 4 :name: Alnilam diff --git a/compass.gemspec b/compass.gemspec index d6c1194e..0265175c 100644 --- a/compass.gemspec +++ b/compass.gemspec @@ -3,7 +3,8 @@ require File.join(path, 'compass/version') Gem::Specification.new do |gemspec| gemspec.name = "compass" - gemspec.version = Compass::VERSION # Update the VERSION.yml file to set this. + gemspec.date = Date.today + gemspec.version = Compass::VERSION # Update VERSION.yml file to set this. gemspec.description = "Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintainance of CSS." gemspec.homepage = "http://compass-style.org" gemspec.authors = ["Chris Eppstein", "Eric A. Meyer", "Brandon Mathis", "Nico Hagenburger", "Scott Davis"] diff --git a/doc-src/content/help/tutorials/contributing.markdown b/doc-src/content/help/tutorials/contributing.markdown index 05cb1e4a..9e40ff6a 100644 --- a/doc-src/content/help/tutorials/contributing.markdown +++ b/doc-src/content/help/tutorials/contributing.markdown @@ -10,7 +10,7 @@ Contributing Stylesheets to Compass Thank you for your interest in contributing to Compass. Our goal is to make it as easy as we can for you to contribute changes to compass -- So if there's something here that -seems harder than it aught to be, please let us know. +seems harder than it ought to be, please let us know. If you find a bug **in this document**, you are bound to contribute a fix. Stop reading now if you do not wish to abide by this rule. diff --git a/doc-src/content/index/functions.haml b/doc-src/content/index/functions.haml index 3db82d99..03b28450 100644 --- a/doc-src/content/index/functions.haml +++ b/doc-src/content/index/functions.haml @@ -5,7 +5,7 @@ body_id: home --- %article %h1#logo Sass Based Functions - + - all_functions.sorted_and_grouped_by_name{|f| f.last.name }.each do |(group, functions)| %h3= group %ul @@ -13,12 +13,22 @@ body_id: home %li %a{:href=>"#{i.path}#function-#{f.name}"}= f.sass_signature(:html) + - sass_function_list = [] %h1#logo All Ruby Based Functions + %h3 Compass Functions %ul - Sass::Script::Functions.public_instance_methods.sort_by{|m| m.to_s}.each do |m| - %li - - name = m.to_s.gsub("_","-") + - name = m.to_s.gsub("_","-") + - unless name =~ /^\-compass/ # Private Fuctions! - if i = item_for_function_name(name) - %a{:href=>"#{i.path}##{name}"}= name + %li + %a{:href=>"#{i.path}##{name}"}= name + - elsif sass_functions().include? m + - sass_function_list << '%s' % [m.to_s, name] - else - = name \ No newline at end of file + %li + = name + %h3 Sass Functions + %ul + - sass_function_list.each do |m| + %li= m \ No newline at end of file diff --git a/doc-src/lib/stylesheets.rb b/doc-src/lib/stylesheets.rb index 6fa56b6b..4bd2e6f1 100644 --- a/doc-src/lib/stylesheets.rb +++ b/doc-src/lib/stylesheets.rb @@ -60,7 +60,7 @@ def import_paths File.dirname(@item[:stylesheet])), @item[:stylesheet]["/"] ? File.dirname(@item[:stylesheet]) : ""] end - + paths += Compass::Frameworks::ALL.inject([]) {|m, f| m << f.stylesheets_directory}.map!{|p|[p, '']} paths end @@ -183,6 +183,12 @@ def all_functions end end +# Sass Only Functions from 3.1.10 (Brainy Betty) +# Not as elegant, but does the trick. +def sass_functions + [:rgb, :rgba, :hsl, :hsla, :red, :green, :blue, :hue, :saturation, :lightness, :alpha, :opacity, :opacify, :fade_in, :transparentize, :fade_out, :lighten, :darken, :saturate, :desaturate, :adjust_hue, :adjust_color, :scale_color, :change_color, :mix, :grayscale, :complement, :invert, :unquote, :quote, :type_of, :unit, :unitless, :comparable, :percentage, :round, :ceil, :floor, :abs, :length, :nth, :join, :append, :zip, :index, :if] +end + def example_items @site.cached("examples") do @items.select do |i| diff --git a/frameworks/compass/stylesheets/compass/css3/_background-clip.scss b/frameworks/compass/stylesheets/compass/css3/_background-clip.scss index 47a78f64..6ce473f6 100644 --- a/frameworks/compass/stylesheets/compass/css3/_background-clip.scss +++ b/frameworks/compass/stylesheets/compass/css3/_background-clip.scss @@ -35,8 +35,8 @@ $default-background-clip: padding-box !default; @include experimental(background-clip, $clip, not -moz, not -webkit, - -o, - -ms, + not -o, + not -ms, -khtml, official ); diff --git a/lib/compass/commands/update_project.rb b/lib/compass/commands/update_project.rb index 66098d34..0d8f5505 100644 --- a/lib/compass/commands/update_project.rb +++ b/lib/compass/commands/update_project.rb @@ -67,7 +67,6 @@ module Compass if options.include?(:debug_info) && options[:debug_info] compiler_opts[:sass][:debug_info] = options.delete(:debug_info) end - puts compiler_opts.inspect compiler_opts end diff --git a/lib/compass/sass_extensions/functions/trig.rb b/lib/compass/sass_extensions/functions/trig.rb index 5ee9436d..68c998ed 100644 --- a/lib/compass/sass_extensions/functions/trig.rb +++ b/lib/compass/sass_extensions/functions/trig.rb @@ -19,7 +19,7 @@ module Compass::SassExtensions::Functions::Trig private def trig(operation, number) if number.numerator_units == ["deg"] && number.denominator_units == [] - Sass::Script::Number.new(Math.send(operation, (number.value * Math::PI / 180))) + Sass::Script::Number.new(Math.send(operation, Math::PI * number.value / 180)) else Sass::Script::Number.new(Math.send(operation, number.value), number.numerator_units, number.denominator_units) end diff --git a/test/fixtures/stylesheets/compass/css/background-clip.css b/test/fixtures/stylesheets/compass/css/background-clip.css new file mode 100644 index 00000000..45c9574d --- /dev/null +++ b/test/fixtures/stylesheets/compass/css/background-clip.css @@ -0,0 +1,10 @@ +.background-clip { + -webkit-background-clip: border; + -moz-background-clip: border; + background-clip: border-box; } + +.background-clip-khtml { + -webkit-background-clip: border; + -moz-background-clip: border; + -khtml-background-clip: border-box; + background-clip: border-box; } \ No newline at end of file diff --git a/test/fixtures/stylesheets/compass/sass/background-clip.scss b/test/fixtures/stylesheets/compass/sass/background-clip.scss new file mode 100644 index 00000000..03fd4cc6 --- /dev/null +++ b/test/fixtures/stylesheets/compass/sass/background-clip.scss @@ -0,0 +1,8 @@ +@import "compass/css3/background-clip"; + +.background-clip { @include background-clip('border-box'); } + +.background-clip-khtml { + $experimental-support-for-khtml:true; + @include background-clip('border-box'); +} \ No newline at end of file