1
0
Fork 0
mirror of https://github.com/haml/haml.git synced 2022-11-09 12:33:31 -05:00

Merge branch 'master' into yard

This commit is contained in:
Nathan Weizenbaum 2009-04-24 18:59:36 -07:00
commit 6741a0a271
2 changed files with 1 additions and 2 deletions

View file

@ -60,7 +60,6 @@ module Sass::Script
end
instance_methods.each { |m| undef_method m unless m.to_s =~ /^__/ }
extend self
# Creates a {Color} object from hue, saturation, and lightness
# as per the CSS3 spec (http://www.w3.org/TR/css3-color/#hsl-color).

View file

@ -92,7 +92,7 @@ class SassFunctionTest < Test::Unit::TestCase
def assert_rgb_hsl(rgb, hsl)
hsl = hsl.map {|v| Sass::Script::Parser.parse v, 0, 0 }
assert_equal(rgb, Sass::Script::Functions.hsl(*hsl).value)
assert_equal(rgb, Sass::Script::Functions::EvaluationContext.new({}).hsl(*hsl).value)
end
def evaluate(value)