Merge branch 'temp2'
* temp2: Record current revision for release. Updated the CHANGELOG for the 0.8.11 release. Version bump to 0.8.11 [Compass Core] Bug fix to sprites: fixed width and height assignments for x and y position variables Fix build failure in the RunCodeRun environment. Ruby 1.9.1 fix: binding for parse_string [Rails] [Closes #32] Don't suggest creating a stylesheet link to partials.
This commit is contained in:
commit
8f45eaabe9
@ -1,5 +1,16 @@
|
||||
COMPASS CHANGELOG
|
||||
=================
|
||||
|
||||
0.8.11 (August 22, 2009)
|
||||
------------------------
|
||||
|
||||
Bug Fix Release:
|
||||
|
||||
* [Compass Core] Bug fix to sprites: fixed width and height assignments for x and y position variables
|
||||
* Ruby 1.9.1 fix: binding for parse_string
|
||||
* [Rails] Don't suggest creating a stylesheet link to partials.
|
||||
|
||||
|
||||
0.8.10 (August 16, 2009)
|
||||
------------------------
|
||||
Bug Fix Release:
|
||||
|
2
REVISION
2
REVISION
@ -1 +1 @@
|
||||
0492fc99695bf8ec64cb64ca41b7451db9e01fcb
|
||||
fbda9944793fa5cf0fc0d53a5205ddfee05d5ab0
|
@ -1,4 +1,4 @@
|
||||
---
|
||||
:patch: 10
|
||||
:patch: 11
|
||||
:major: 0
|
||||
:minor: 8
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
// Simplest use: +sprite-img("icons-32.png", 1)
|
||||
=sprite-img(!img, !col, !row = 1, !width = !sprite_image_default_width, !height = !sprite_image_default_height, !margin = !sprite_image_default_margin)
|
||||
!x = ((!col - 1) * -!height) - ((!col - 1) * !margin)
|
||||
!y = ((!row - 1) * -!width) - ((!row - 1) * !margin)
|
||||
!x = ((!col - 1) * -!width) - ((!col - 1) * !margin)
|
||||
!y = ((!row - 1) * -!height) - ((!row - 1) * !margin)
|
||||
:background= image_url(!img) "no-repeat" !x !y
|
||||
:width= !width
|
||||
:height= !height
|
||||
|
@ -39,9 +39,10 @@ module Compass
|
||||
end
|
||||
|
||||
def parse_string(contents, filename)
|
||||
eval(contents, binding, filename)
|
||||
bind = binding
|
||||
eval(contents, bind, filename)
|
||||
ATTRIBUTES.each do |prop|
|
||||
value = eval(prop.to_s, binding) rescue nil
|
||||
value = eval(prop.to_s, bind) rescue nil
|
||||
self.send("#{prop}=", value) if value
|
||||
end
|
||||
if @added_import_paths
|
||||
|
@ -117,6 +117,8 @@ Compass.configure_sass_plugin!
|
||||
def stylesheet_links
|
||||
html = "%head\n"
|
||||
manifest.each_stylesheet do |stylesheet|
|
||||
# Skip partials.
|
||||
next if File.basename(stylesheet.from)[0..0] == "_"
|
||||
ss_line = " = stylesheet_link_tag '#{stylesheet_prefix}#{stylesheet.to.sub(/\.sass$/,'.css')}'"
|
||||
if stylesheet.options[:media]
|
||||
ss_line += ", :media => '#{stylesheet.options[:media]}'"
|
||||
|
@ -19,7 +19,7 @@ class CommandLineTest < Test::Unit::TestCase
|
||||
|
||||
def test_list_frameworks
|
||||
compass "--list-frameworks"
|
||||
assert_equal("blueprint\ncompass\nyui\n", @last_result)
|
||||
assert_equal(%w(blueprint compass yui), @last_result.split.sort)
|
||||
end
|
||||
|
||||
def test_basic_install
|
||||
|
Loading…
Reference in New Issue
Block a user