github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed gemfile and removed coercion to float

Browse Source
This commit is contained in:
Scott Davis 2011-04-20 19:57:19 -04:00
parent ac623c620b
commit fec367d60c
4 changed files with 40 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -2,7 +2,7 @@ source :rubygems
gemspec gemspec
gem "compass", :path => "." #gem "compass", :path => "." #no idea but it fixed my rage - sdavis
gem "cucumber", "~> 0.9.2" gem "cucumber", "~> 0.9.2"
gem "rspec", "~>2.0.0" gem "rspec", "~>2.0.0"
gem "rails", "~>3.0.0.rc" gem "rails", "~>3.0.0.rc"
@ -21,4 +21,3 @@ gem 'autotest'
gem 'fakefs', :git => 'git://github.com/johnbintz/fakefs.git' gem 'fakefs', :git => 'git://github.com/johnbintz/fakefs.git'
gem 'mocha' gem 'mocha'
gem 'timecop' gem 'timecop'
#gem 'rmagick'

71
Gemfile.lock
View File

@ -7,7 +7,7 @@ GIT
PATH PATH
remote: . remote: .
specs: specs:
compass (0.11.beta.7.8642187) compass (0.11.beta.7.ac623c6)
chunky_png (~> 1.1.0) chunky_png (~> 1.1.0)
fssm (~> 0.2) fssm (~> 0.2)
sass (>= 3.1.0.alpha.249) sass (>= 3.1.0.alpha.249)
@ -17,33 +17,33 @@ GEM
specs: specs:
ZenTest (4.5.0) ZenTest (4.5.0)
abstract (1.0.0) abstract (1.0.0)
actionmailer (3.0.5) actionmailer (3.0.7)
actionpack (= 3.0.5) actionpack (= 3.0.7)
mail (~> 2.2.15) mail (~> 2.2.15)
actionpack (3.0.5) actionpack (3.0.7)
activemodel (= 3.0.5) activemodel (= 3.0.7)
activesupport (= 3.0.5) activesupport (= 3.0.7)
builder (~> 2.1.2) builder (~> 2.1.2)
erubis (~> 2.6.6) erubis (~> 2.6.6)
i18n (~> 0.4) i18n (~> 0.5.0)
rack (~> 1.2.1) rack (~> 1.2.1)
rack-mount (~> 0.6.13) rack-mount (~> 0.6.14)
rack-test (~> 0.5.7) rack-test (~> 0.5.7)
tzinfo (~> 0.3.23) tzinfo (~> 0.3.23)
activemodel (3.0.5) activemodel (3.0.7)
activesupport (= 3.0.5) activesupport (= 3.0.7)
builder (~> 2.1.2) builder (~> 2.1.2)
i18n (~> 0.4) i18n (~> 0.5.0)
activerecord (3.0.5) activerecord (3.0.7)
activemodel (= 3.0.5) activemodel (= 3.0.7)
activesupport (= 3.0.5) activesupport (= 3.0.7)
arel (~> 2.0.2) arel (~> 2.0.2)
tzinfo (~> 0.3.23) tzinfo (~> 0.3.23)
activeresource (3.0.5) activeresource (3.0.7)
activemodel (= 3.0.5) activemodel (= 3.0.7)
activesupport (= 3.0.5) activesupport (= 3.0.7)
activesupport (3.0.5) activesupport (3.0.7)
addressable (2.2.4) addressable (2.2.5)
arel (2.0.9) arel (2.0.9)
autotest (4.4.6) autotest (4.4.6)
ZenTest (>= 4.4.1) ZenTest (>= 4.4.1)
@ -65,23 +65,18 @@ GEM
erubis (2.6.6) erubis (2.6.6)
abstract (>= 1.0.0) abstract (>= 1.0.0)
eventmachine (0.12.10) eventmachine (0.12.10)
eventmachine (0.12.10-java)
fssm (0.2.6.1) fssm (0.2.6.1)
gherkin (2.2.9) gherkin (2.2.9)
json (~> 1.4.6) json (~> 1.4.6)
term-ansicolor (~> 1.0.5) term-ansicolor (~> 1.0.5)
gherkin (2.2.9-java)
json (~> 1.4.6)
term-ansicolor (~> 1.0.5)
haml (3.1.0.alpha.147) haml (3.1.0.alpha.147)
i18n (0.5.0) i18n (0.5.0)
json (1.4.6) json (1.4.6)
json (1.4.6-java)
livereload (1.6) livereload (1.6)
em-dir-watcher (>= 0.1) em-dir-watcher (>= 0.1)
em-websocket (>= 0.1.2) em-websocket (>= 0.1.2)
ruby-json (>= 1.1.2) ruby-json (>= 1.1.2)
mail (2.2.15) mail (2.2.17)
activesupport (>= 2.3.6) activesupport (>= 2.3.6)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
@ -94,23 +89,22 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (0.5.7) rack-test (0.5.7)
rack (>= 1.0) rack (>= 1.0)
rails (3.0.5) rails (3.0.7)
actionmailer (= 3.0.5) actionmailer (= 3.0.7)
actionpack (= 3.0.5) actionpack (= 3.0.7)
activerecord (= 3.0.5) activerecord (= 3.0.7)
activeresource (= 3.0.5) activeresource (= 3.0.7)
activesupport (= 3.0.5) activesupport (= 3.0.7)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.0.5) railties (= 3.0.7)
railties (3.0.5) railties (3.0.7)
actionpack (= 3.0.5) actionpack (= 3.0.7)
activesupport (= 3.0.5) activesupport (= 3.0.7)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (~> 0.14.4) thor (~> 0.14.4)
rake (0.8.7) rake (0.8.7)
rb-fsevent (0.4.0) rb-fsevent (0.4.0)
rcov (0.9.9) rcov (0.9.9)
rcov (0.9.9-java)
rspec (2.0.1) rspec (2.0.1)
rspec-core (~> 2.0.1) rspec-core (~> 2.0.1)
rspec-expectations (~> 2.0.1) rspec-expectations (~> 2.0.1)
@ -122,7 +116,7 @@ GEM
rspec-core (~> 2.0.1) rspec-core (~> 2.0.1)
rspec-expectations (~> 2.0.1) rspec-expectations (~> 2.0.1)
ruby-json (1.1.2) ruby-json (1.1.2)
ruby-prof (0.9.2) ruby-prof (0.10.5)
rubyzip (0.9.4) rubyzip (0.9.4)
sass (3.1.0.alpha.249) sass (3.1.0.alpha.249)
term-ansicolor (1.0.5) term-ansicolor (1.0.5)
@ -130,10 +124,9 @@ GEM
timecop (0.3.5) timecop (0.3.5)
treetop (1.4.9) treetop (1.4.9)
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.25) tzinfo (0.3.26)
PLATFORMS PLATFORMS
java
ruby ruby
DEPENDENCIES DEPENDENCIES

11
lib/compass/sass_extensions/functions/gradient_support.rb
View File

@ -348,10 +348,6 @@ module Compass::SassExtensions::Functions::GradientSupport
svg = linear_svg(stops, x1, y1, x2, y2) svg = linear_svg(stops, x1, y1, x2, y2)
inline_image_string(svg.gsub(/\s+/, ' '), 'image/svg+xml') inline_image_string(svg.gsub(/\s+/, ' '), 'image/svg+xml')
end end
def angle?
position_or_angle.is_a?(Sass::Script::Number) && position_or_angle.numerator_units == ["deg"] && position_or_angle.denominator_units.empty?
end
def radial_svg_gradient(color_stops, center) def radial_svg_gradient(color_stops, center)
cx, cy = *grad_point(center).value cx, cy = *grad_point(center).value
@ -440,12 +436,15 @@ module Compass::SassExtensions::Functions::GradientSupport
arg.all?{|a| color_stop?(a)} ? arg : nil arg.all?{|a| color_stop?(a)} ? arg : nil
end end
end end
def angle?
position_or_angle.is_a?(Sass::Script::Number) && position_or_angle.numerator_units == ["deg"] && position_or_angle.denominator_units.empty?
end
def linear_svg(color_stops, x1, y1, x2, y2) def linear_svg(color_stops, x1, y1, x2, y2)
transform = '' transform = ''
if angle? if angle?
deg = Float(position_or_angle.value) transform = " gradientTransform = \"rotate(#{position_or_angle.value})\""
transform = " gradientTransform = \"rotate(#{deg})\""
end end
gradient = %Q{<linearGradient id="grad" gradientUnits="userSpaceOnUse" x1="#{x1}" y1="#{y1}" x2="#{x2}" y2="#{y2}"#{transform}>#{color_stops_svg(color_stops)}</linearGradient>} gradient = %Q{<linearGradient id="grad" gradientUnits="userSpaceOnUse" x1="#{x1}" y1="#{y1}" x2="#{x2}" y2="#{y2}"#{transform}>#{color_stops_svg(color_stops)}</linearGradient>}
svg(gradient) svg(gradient)

4
test/fixtures/stylesheets/compass/css/gradients.css vendored
View File

@ -18,7 +18,7 @@
background: white radial-gradient(center center, #dddddd, #aaaaaa 100px); } background: white radial-gradient(center center, #dddddd, #aaaaaa 100px); }
.bg-linear-gradient-angle-svg { .bg-linear-gradient-angle-svg {
background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9Ii00NSIgeTE9IiIgeDI9Ii00NSIgeTI9IiIgZ3JhZGllbnRUcmFuc2Zvcm0gPSAicm90YXRlKC00NS4wKSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwMDBmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9Ii00NSIgeTE9IiIgeDI9Ii00NSIgeTI9IiIgZ3JhZGllbnRUcmFuc2Zvcm0gPSAicm90YXRlKC00NSkiPjxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiMwMDAwZmYiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA=');
background-size: 100%; background-size: 100%;
background-image: -webkit-gradient(linear, -45deg, -45deg, color-stop(0%, #0000ff), color-stop(100%, #000000)); background-image: -webkit-gradient(linear, -45deg, -45deg, color-stop(0%, #0000ff), color-stop(100%, #000000));
background-image: -webkit-linear-gradient(-45deg, #0000ff, #000000); background-image: -webkit-linear-gradient(-45deg, #0000ff, #000000);
@ -84,7 +84,7 @@
background-image: radial-gradient(center center, #dddddd, #aaaaaa 100px); } background-image: radial-gradient(center center, #dddddd, #aaaaaa 100px); }
.bg-linear-gradient-with-angle { .bg-linear-gradient-with-angle {
background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9Ii00NSIgeTE9IiIgeDI9Ii00NSIgeTI9IiIgZ3JhZGllbnRUcmFuc2Zvcm0gPSAicm90YXRlKC00NS4wKSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2RkZGRkZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2FhYWFhYSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9Ii00NSIgeTE9IiIgeDI9Ii00NSIgeTI9IiIgZ3JhZGllbnRUcmFuc2Zvcm0gPSAicm90YXRlKC00NSkiPjxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiNkZGRkZGQiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNhYWFhYWEiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA=');
background-size: 100%; background-size: 100%;
background-image: -webkit-gradient(linear, -45deg, -45deg, color-stop(0%, #dddddd), color-stop(100%, #aaaaaa)); background-image: -webkit-gradient(linear, -45deg, -45deg, color-stop(0%, #dddddd), color-stop(100%, #aaaaaa));
background-image: -webkit-linear-gradient(-45deg, #dddddd, #aaaaaa); background-image: -webkit-linear-gradient(-45deg, #dddddd, #aaaaaa);