From a83dd6e1431ecfa44d644b36ccb45ee5904c5a0c Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Thu, 18 Sep 2008 21:35:03 -0700
Subject: [PATCH] Move some optional classes and <hr> styles into the
 scaffolding module

---
 .../stylesheets/blueprint/modules/_grid.sass          | 11 -----------
 .../stylesheets/blueprint/modules/_scaffolding.sass   | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass b/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass
index 9842d084..4930112a 100755
--- a/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass
+++ b/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass
@@ -138,14 +138,3 @@
     @for !n from 1 to !layout_grid_columns + 1
       .push-#{!n}
         +push(!n)
-    //*** The following classes are provided for convenience. You can comment them out if you don't want them. ***//
-    // Border on right hand side of a column. You can comment this out if you don't plan to use it.
-    div.border
-      +border
-    // Border with more whitespace, spans one column.
-    div.colborder
-      +colborder
-    hr
-      +colruler
-    hr.space
-      +colspacer
diff --git a/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass b/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass
index e6f16da5..8671b096 100644
--- a/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass
+++ b/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass
@@ -1,3 +1,4 @@
+@import grid
 /*
   The styles contained here are meant to provide for an attractive experience out of the box
   and are meant to be removed once custom visual design begins.
@@ -16,3 +17,13 @@
     +body-margins
     .box
       +box
+    // Border on right hand side of a column. You can comment this out if you don't plan to use it.
+    div.border
+      +border
+    // Border with more whitespace, spans one column.
+    div.colborder
+      +colborder
+    hr
+      +colruler
+    hr.space
+      +colspacer
\ No newline at end of file