From e42bc133dd27b2f9d0a153abb58ba8ce28aeed1b Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Mon, 8 Dec 2008 09:51:36 -0800
Subject: [PATCH] extracted a +global-reset and +nested-reset mixins from the
 reset library which got moved to compass/utilities/general/reset.

---
 .../compass/stylesheets/compass/_reset.sass   | 18 +------------
 .../compass/utilities/general/_reset.sass     | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/frameworks/compass/stylesheets/compass/_reset.sass b/frameworks/compass/stylesheets/compass/_reset.sass
index e24e5bfc..a84d1c8c 100644
--- a/frameworks/compass/stylesheets/compass/_reset.sass
+++ b/frameworks/compass/stylesheets/compass/_reset.sass
@@ -1,19 +1,3 @@
 @import utilities/general/reset.sass
 
-// Global reset rules.
-// For more specific resets, use the reset mixins provided by
-// compass/utilities/general/reset
-html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p,
-pre, a, abbr, acronym, address, code, del, dfn, em, img,
-dl, dt, dd, ol, ul, li, fieldset, form, label, legend, caption, tbody, tfoot, thead, tr
-  +reset
-body
-  :line-height 1.5
-blockquote, q
-  +reset-quotation
-th, td, caption
-  +reset-table-cell
-table
-  +reset-table
-a img
-  :border none
+=global-reset
diff --git a/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass b/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass
index 075a2284..ab80b5af 100644
--- a/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass
+++ b/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass
@@ -1,3 +1,29 @@
+// Global reset rules.
+// For more specific resets, use the reset mixins provided below
+=global-reset
+  html, body
+    +reset
+  +nested-reset
+
+// Reset all elements within some selector scope.To reset the selector itself,
+// mixin the appropriate reset mixin for that element type as well. This could be
+// useful if you want to style a part of your page in a dramatically different way.
+=nested-reset
+  div, span, object, iframe, h1, h2, h3, h4, h5, h6, p,
+  pre, a, abbr, acronym, address, code, del, dfn, em, img,
+  dl, dt, dd, ol, ul, li, fieldset, form, label, legend, caption, tbody, tfoot, thead, tr
+    +reset
+  body
+    :line-height 1.5
+  blockquote, q
+    +reset-quotation
+  th, td, caption
+    +reset-table-cell
+  table
+    +reset-table
+  a img
+    :border none
+
 =reset-box-model
   :margin 0
   :padding 0