<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>blueprint/modules/_debug.sass</filename>
    </added>
    <added>
      <filename>blueprint/modules/_fancy_type.sass</filename>
    </added>
    <added>
      <filename>blueprint/modules/_interaction.sass</filename>
    </added>
    <added>
      <filename>blueprint/modules/_scaffolding.sass</filename>
    </added>
    <added>
      <filename>examples/default/index.html</filename>
    </added>
    <added>
      <filename>examples/default/parts/elements.html</filename>
    </added>
    <added>
      <filename>examples/default/parts/forms.html</filename>
    </added>
    <added>
      <filename>examples/default/parts/grid.html</filename>
    </added>
    <added>
      <filename>examples/default/parts/test-small.jpg</filename>
    </added>
    <added>
      <filename>examples/default/parts/test.jpg</filename>
    </added>
    <added>
      <filename>examples/default/parts/valid.png</filename>
    </added>
    <added>
      <filename>examples/default/stylesheets/ie.sass</filename>
    </added>
    <added>
      <filename>examples/default/stylesheets/images/grid.png</filename>
    </added>
    <added>
      <filename>examples/default/stylesheets/print.sass</filename>
    </added>
    <added>
      <filename>examples/default/stylesheets/screen.sass</filename>
    </added>
    <added>
      <filename>examples/plugins/index.html</filename>
    </added>
    <added>
      <filename>examples/plugins/parts/fancy_type.html</filename>
    </added>
    <added>
      <filename>examples/plugins/parts/test-small.jpg</filename>
    </added>
    <added>
      <filename>examples/plugins/parts/test.jpg</filename>
    </added>
    <added>
      <filename>examples/plugins/parts/valid.png</filename>
    </added>
    <added>
      <filename>examples/plugins/stylesheets/ie.sass</filename>
    </added>
    <added>
      <filename>examples/plugins/stylesheets/images/grid.png</filename>
    </added>
    <added>
      <filename>examples/plugins/stylesheets/print.sass</filename>
    </added>
    <added>
      <filename>examples/plugins/stylesheets/screen.sass</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -56,7 +56,21 @@ task :examples do
       output.write(engine.render)
       output.close      
     end
+    # copy any other non-haml and non-sass files directly over
     target_dir = &quot;compiled_examples/#{example.sub(%r{.*/},'')}&quot;
-    FileUtils.cp_r(&quot;#{example}/images&quot;, target_dir) if File.exists?(&quot;#{example}/images&quot;)
+    other_files = FileList[&quot;#{example}/**/*&quot;]
+    other_files.exclude &quot;**/*.sass&quot;, &quot;*.haml&quot;
+    other_files.each do |file|
+      
+      if File.directory?(file)
+        FileUtils.mkdir_p(file)
+      elsif File.file?(file)
+        target_file = &quot;#{target_dir}/#{file[(example.size+1)..-1]}&quot;
+        # puts &quot;mkdir -p #{File.dirname(target_file)}&quot;
+        FileUtils.mkdir_p(File.dirname(target_file))
+        # puts &quot;cp #{file} #{target_file}&quot;
+        FileUtils.cp(file, target_file)
+      end
+    end
   end
 end
\ No newline at end of file</diff>
      <filename>Rakefile</filename>
    </modified>
    <modified>
      <diff>@@ -4,10 +4,13 @@
 @import modules/typography
 @import modules/utilities
 @import modules/form
+@import modules/interaction
+@import modules/debug
 
 =blueprint
   +blueprint-grid
   +blueprint-typography
   +blueprint-utilities
-  form
-    +blueprint-form
+  +blueprint-debug
+  +blueprint-interaction
+  +blueprint-form</diff>
      <filename>blueprint/_blueprint.sass</filename>
    </modified>
    <modified>
      <diff>@@ -41,28 +41,3 @@
     :width 390px
     :height 250px
     :padding 5px
-  .error
-    :padding .8em
-    :margin-bottom 1em
-    :border 2px solid #ddd
-    :background= !error_bg_color
-    :color= !error_color
-    :border-color= !error_border_color
-    a
-      :color= !error_color
-  .notice,  .success
-    :padding .8em
-    :margin-bottom 1em
-    :border 2px solid #ddd
-  .notice
-    :background= !notice_bg_color
-    :color= !notice_color
-    :border-color= !notice_border_color
-    a
-      :color= !notice_color
-  .success
-    :background= !success_bg_color
-    :color= !success_color
-    :border-color= !success_border_color
-    a
-      :color= !success_color</diff>
      <filename>blueprint/modules/_form.sass</filename>
    </modified>
    <modified>
      <diff>@@ -40,10 +40,13 @@
   :margin
     :right 0
 
+=span(!n)
+  :width = !layout_grid_width * !n + (!layout_grid_margin * (!n - 1))
+
 // Use this mixins to set the width of n columns.
 =column(!n, !last = false)
   :float left
-  :width = !layout_grid_width * !n + (!layout_grid_margin * (!n - 1))
+  +span(!n)
   @if !last
     +last
   @if !!last
@@ -52,7 +55,7 @@
 // Mixin to a column to append n empty cols.
 =append(!n)
   :padding-right = (!layout_grid_outer_width) * !n
-  
+
 // Mixin to a column to prepend n empty cols.
 =prepend(!n)
   :padding-left = (!layout_grid_outer_width) * !n
@@ -61,7 +64,7 @@
 =pull(!n)
   :float left
   :position relative
-  :margin-left = (!layout_grid_outer_width) * (2 - !n)
+  :margin-left = -!layout_grid_outer_width * !n
 
 // mixin to a column to push it n columns to the right
 =push(!n)
@@ -69,9 +72,9 @@
   :position relative
   :margin
     :top 0
-    :right = !layout_grid_outer_width * (1 - !n)
+    :right = -!layout_grid_outer_width * !n
     :bottom 1.5em
-    :left = !layout_grid_outer_width
+    :left = -!layout_grid_outer_width * !n
 
 // Border on right hand side of a column.
 =border
@@ -81,26 +84,20 @@
 
 // Border with more whitespace, spans one column.
 =colborder
-  :padding-right 38px
-  :margin-right 35px
+  :padding-right= !layout_grid_width - 0.5 * !layout_grid_margin - 1
+  :margin-right= !layout_grid_width - 0.5 * !layout_grid_margin
   :border-right 1px solid #eee
 
-// Mixin +box to create a padded box inside a column.
-=box
-  :padding 1.5em 
-  :margin-bottom 1.5em 
-  :background #E5ECF9 
-
 // Mixin this to an hr to make a horizontal ruler across a column.
 =colruler
-  :background #ddd 
+  :background #ddd
   :color #ddd
-  :clear both 
-  :float none 
-  :width 100% 
+  :clear both
+  :float none
+  :width 100%
   :height .1em
   :margin 0 0 1.45em
-  :border none 
+  :border none
 
 // Mixin this to an hr to make a horizontal spacer across a column.
 =colspacer
@@ -112,13 +109,16 @@
   // A container should group all your columns
   .container
     +container
-    // The last column in a row needs this class (or mixin) or it will end up on the next row.
-    div.last
-      +last
     // Use these classes (or mixins) to set the width of a column.
     @for !n from 1 to !layout_grid_columns + 1
       .span-#{!n}
-        +column(!n, !n == !layout_grid_columns)
+        +span(!n)
+      div
+        &amp;.span-#{!n}
+          +column(!n, !n == !layout_grid_columns)
+    // The last column in a row needs this class (or mixin) or it will end up on the next row.
+    div.last
+      +last
     // Add these to a column to append empty cols.
     @for !n from 1 to !layout_grid_columns
       .append-#{!n}
@@ -144,5 +144,5 @@
       +colborder
     hr
       +colruler
-    hr.spacer
+    hr.space
       +colspacer</diff>
      <filename>blueprint/modules/_grid.sass</filename>
    </modified>
    <modified>
      <diff>@@ -5,7 +5,7 @@
 // This is recommended now:
 // [http://www.sitepoint.com/examples/clearing_floats/example2.php]
 =clearfix
-  :overflow none
+  :overflow auto
   // This makes ie6 get layout
   html &amp;
     :display inline-block
@@ -16,25 +16,11 @@
 =nowrap
   :white-space nowrap
 
-=highlight
-  :background #ff0
-
-=added
-  :background #060
-  :color #fff
-
-=removed
-  :background #900
-  :color #fff
-
 
 // Most of these utility classes are not &quot;semantic&quot;. If you use them,
 // you are mixing your content and presentation. For shame!
 
 =blueprint-utilities
-  // Use this class on any div.span / container to see the grid.
-  .showgrid
-    :background url(/images/grid.png) 
   // Regular clearing apply to column that should drop below previous ones.
   .clear
     :clear both
@@ -53,14 +39,6 @@
     :font-size 1.2em
     :line-height 2.5em
     :margin-bottom 1.25em
-  .hide
-    :display none
-  .highlight
-    +highlight
-  .added
-    +added
-  .removed
-    +removed
   .first
     :margin-left 0
     :padding-left 0</diff>
      <filename>blueprint/modules/_utilities.sass</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>6f0919ff8f5974106c91ccc4e6733da5404297af</id>
    </parent>
  </parents>
  <author>
    <name>Chris Eppstein</name>
    <email>chris@eppsteins.net</email>
  </author>
  <url>http://github.com/chriseppstein/blueprint-sass/commit/55e90b2fbadb452d3ae3744f97ff0b3c3d0cadbd</url>
  <id>55e90b2fbadb452d3ae3744f97ff0b3c3d0cadbd</id>
  <committed-date>2008-08-15T08:13:24-07:00</committed-date>
  <authored-date>2008-08-15T08:01:26-07:00</authored-date>
  <message>CSS can now be generated that is 100% backwards compatible with blueprint-css (see the default and fancy_type examples).

This is a backport of the sass branch of blueprint-css that I've been working on at:
http://github.com/chriseppstein/blueprint-css/tree/sass

Summary of changes:
* Factored a span mixin out of column this can be used to set the width without making a &quot;column&quot;
* Added a debug module to hold styles and mixins useful during development
* Added a scaffolding module to hold styles that are only useful if you're
  not doing much styling on your project and just want things to look good.
* Factored out an interaction module that holds styles and mixins related to user-feedback
* Ported the fancy-type plugin from blueprint-css
* Fixed a number of calculation errors in the grid module
* New examples - stolen from blueprint-css to achieve pixel-perfect matching</message>
  <tree>2651836f4a133e72abfdb76a4d3e826a5d310856</tree>
  <committer>
    <name>Chris Eppstein</name>
    <email>chris@eppsteins.net</email>
  </committer>
</commit>
