Merge branch 'edge' into ericam_edge

* edge:
  Fix test failure.
  [Blueprint] Fixed clipping of ordinals for IE in an ordered list.
  [Blueprint] When using the RTL plugin, columns are now text-align:right.
  [Blueprint] Add visibility:hidden to hr.space and +colspacer so it's useful outside of white backgrounds
  Fix grid builder to properly generate png
  [Blueprint] Password inputs now the same style as regular text inputs
  [Tests] Process expected result files thru erb to account for more transient behaviors across different systems.
  fix broken test.
  Don't use methods not available in ruby 1.8.6
  Changes for blueprint commit 9be685760014b3258dcd83913b9b19f130551b2f

lib/compass/frameworks.rb

@@ -28,7 +28,7 @@ module Compass
     end
 
     def register(name, *arguments)
-      if idx = ALL.index{|f| f.name.to_s == name.to_s}
+      if idx = ALL.index(self[name])
         ALL[idx] = Framework.new(name, *arguments)
       else
         ALL << Framework.new(name, *arguments)

lib/compass/frameworks/blueprint/stylesheets/blueprint/_form.sass

@@ -21,7 +21,7 @@
     font-weight: bold
     font-size: 1.2em
   input
-    &.text, &.title, &[type=text]
+    &.text, &.title, &[type=text], &[type=password]
       margin: 0.5em 0
       background-color: #fff
       padding: 5px
@@ -38,7 +38,8 @@
     margin: 0.5em 0
 
 =blueprint-form-sizes(!input_width = 300px, !textarea_width = 390px, !textarea_height = 250px)
-  input.text, input.title
+  input
+    &.text, &.title, &[type=text], &[type=password]
       width= !input_width
   textarea
     width= !textarea_width
@@ -47,7 +48,7 @@
 =blueprint-form-borders(!unfocused_border_color = #bbb, !focus_border_color = #666, !fieldset_border_color = #ccc)
   fieldset
     border= 1px "solid" !fieldset_border_color
-  input.text, input.title,
+  input.text, input.title, input[type=text], input[type=password],
   textarea,
   select
     border= 1px "solid" !unfocused_border_color

lib/compass/frameworks/blueprint/stylesheets/blueprint/_grid.sass

@@ -176,3 +176,4 @@
   +colruler
   background: #fff
   color: #fff
+  visibility: hidden

lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass

@@ -56,8 +56,6 @@
 =blueprint-ie-defaults
   .container
     text-align: left
-  ol
-    margin-left: 2em
   sup
     vertical-align: text-top
   sub
@@ -68,6 +66,8 @@
     -ms-interpolation-mode: bicubic
   fieldset
     padding-top: 0
+  textarea
+    overflow: auto
   input
     &.text
       margin: 0.5em 0

lib/compass/frameworks/blueprint/stylesheets/blueprint/_print.sass

@@ -62,9 +62,6 @@
     font:
       size: .9em
       family= !blueprint_fixed_font_family
-  img
-    +float-left
-    margin: 1.5em 1.5em 1.5em 0
   a
     img
       border: none

lib/compass/frameworks/blueprint/stylesheets/blueprint/_reset.sass

@@ -3,6 +3,8 @@
 =blueprint-global-reset
   html, body
     +blueprint-reset
+  html
+    font-size: 100.01%
   +blueprint-nested-reset
 
 // Reset all elements within some selector scope.To reset the selector itself,

lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass

@@ -29,6 +29,7 @@
     +last
   @else
     margin-left= !blueprint_grid_margin
+  text-align: right
   * html &
     overflow-x: hidden
 

lib/compass/frameworks/blueprint/stylesheets/blueprint/_typography.sass

@@ -125,13 +125,15 @@
     white-space: pre
   pre, code, tt
     +fixed-width-text
-  li ul,  li ol
+  li
-    margin: 0 1.5em
+    ul, ol
+      margin: 0
+  ul, ol
+    margin: 0 1.5em 1.5em 0
+    padding-left: 3.333em
   ul
-    margin: 0 1.5em 1.5em 1.5em
     list-style-type: disc
   ol
-    margin: 0 1.5em 1.5em 1.5em
     list-style-type: decimal
   dl
     margin: 0 0 1.5em 0

lib/compass/grid_builder.rb

@@ -48,7 +48,7 @@ module Compass
         canvas.background_fill = 'white'
 
         canvas.g do |column|
-          column.rect(self.column_width, @height).styles(:fill => "#e8effb")
+          column.rect(self.column_width - 1, @height).styles(:fill => "#e8effb")
         end
 
         canvas.g do |baseline|

test/compass_test.rb

@@ -77,7 +77,7 @@ private
       actual_result_file = "#{tempfile_path(@current_project)}/#{name}.css"
       expected_result_file = "#{result_path(@current_project)}/#{name}.css"
       actual_lines = File.read(actual_result_file).split("\n")
-      expected_lines = File.read(expected_result_file).split("\n")
+      expected_lines = ERB.new(File.read(expected_result_file)).result(binding).split("\n")
       expected_lines.zip(actual_lines).each_with_index do |pair, line|
         message = "template: #{name}\nline:     #{line + 1}"
         assert_equal(pair.first, pair.last, message)

test/fixtures/stylesheets/blueprint/css/typography.css

@@ -111,14 +111,16 @@ pre, code, tt {
   line-height: 1.5; }
 
 li ul, li ol {
-  margin: 0 1.5em; }
+  margin: 0; }
+
+ul, ol {
+  margin: 0 1.5em 1.5em 0;
+  padding-left: 3.333em; }
 
 ul {
-  margin: 0 1.5em 1.5em 1.5em;
   list-style-type: disc; }
 
 ol {
-  margin: 0 1.5em 1.5em 1.5em;
   list-style-type: decimal; }
 
 dl {

test/fixtures/stylesheets/relative/css/screen.css

@@ -1 +1 @@
-test { background: url('../assets/images/testing.png?1258702388'); }
+test { background: url('../assets/images/testing.png?<%= File.mtime(File.join(Compass.configuration.project_path, 'assets', 'images', 'testing.png')).strftime("%s") %>'); }