[Blueprint] Regression fix: automatically apply the reset if blueprint/reset is imported. Closes GH-132.

doc-src/content/CHANGELOG.markdown

@@ -10,6 +10,11 @@ COMPASS CHANGELOG
 0.10.1 (May 13, 2010)
 ---------------------
 
+* Fixed a regression in the Blueprint module, the blueprint reset
+  was no longer automatically applying the reset styles. This behavior
+  is restored in this release. If you `@import blueprint/reset` and
+  then apply the reset mixin yourself, you should remove the mixin
+  call or change your import to `blueprint/reset/utilities`.
 * Added a subcommand for emitting sass imports for the sass CLI.
 * Added a subcommand for listing the available frameworks.
 

doc-src/content/reference/blueprint/reset.haml

@@ -10,4 +10,5 @@ classnames:
 ---
 - render 'reference' do
   %p
-    A reset and base styling.
+    A reset and base styling automatically applied to your webpage
+    by importing this module.

doc-src/content/reference/blueprint/reset/utilities.scss

@@ -0,0 +1,13 @@
+--- 
+title: Blueprint Reset
+crumb: Reset
+framework: blueprint
+stylesheet: blueprint/reset/_utilities.scss
+layout: blueprint
+classnames:
+  - reference
+  - blueprint
+---
+- render 'reference' do
+  %p
+    Utility mixins for applying a reset and base styling.

frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/modules/_reset.sass

@@ -1,2 +1,2 @@
-@warn "DEPRECATED: Please change your @import of blueprint/modules/reset.sass to: @import \"blueprint/reset\""
+@warn "DEPRECATED: Please change your @import of blueprint/modules/reset.sass to: @import \"blueprint/reset/utilities\""
-@import blueprint/reset.scss
+@import blueprint/reset/utilities.scss

frameworks/blueprint/stylesheets/blueprint/_reset.scss

@@ -1,58 +1,3 @@
-// Global reset rules.
+@import "reset/utilities";
-// For more specific resets, use the reset mixins provided below
-@mixin blueprint-global-reset {
-  html, body {
-    @include blueprint-reset; }
-  html {
-    font-size: 100.01%; }
-  @include blueprint-nested-reset; }
 
-// Reset all elements within some selector scope.To reset the selector itself,
+@include blueprint-global-reset;
-// 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.
-@mixin blueprint-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 {
-    @include blueprint-reset; }
-  blockquote, q {
-    @include blueprint-reset-quotation; }
-  th, td, caption {
-    @include blueprint-reset-table-cell; }
-  table {
-    @include blueprint-reset-table; }
-  a img {
-    border: none; } }
-
-@mixin blueprint-reset-box-model {
-  margin: 0;
-  padding: 0;
-  border: 0; }
-
-@mixin blueprint-reset {
-  @include blueprint-reset-box-model;
-  font: {
-    weight: inherit;
-    style: inherit;
-    size: 100%;
-    family: inherit; };
-  vertical-align: baseline; }
-
-@mixin blueprint-reset-quotation {
-  @include blueprint-reset;
-  quotes: "" "";
-  &:before,
-  &:after {
-    content: ""; } }
-
-@mixin blueprint-reset-table-cell {
-  @include blueprint-reset;
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle; }
-
-@mixin blueprint-reset-table {
-  @include blueprint-reset;
-  border-collapse: separate;
-  border-spacing: 0;
-  vertical-align: middle; }

frameworks/blueprint/stylesheets/blueprint/reset/_utilities.scss

@@ -0,0 +1,58 @@
+// Global reset rules.
+// For more specific resets, use the reset mixins provided below
+@mixin blueprint-global-reset {
+  html, body {
+    @include blueprint-reset; }
+  html {
+    font-size: 100.01%; }
+  @include blueprint-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.
+@mixin blueprint-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 {
+    @include blueprint-reset; }
+  blockquote, q {
+    @include blueprint-reset-quotation; }
+  th, td, caption {
+    @include blueprint-reset-table-cell; }
+  table {
+    @include blueprint-reset-table; }
+  a img {
+    border: none; } }
+
+@mixin blueprint-reset-box-model {
+  margin: 0;
+  padding: 0;
+  border: 0; }
+
+@mixin blueprint-reset {
+  @include blueprint-reset-box-model;
+  font: {
+    weight: inherit;
+    style: inherit;
+    size: 100%;
+    family: inherit; };
+  vertical-align: baseline; }
+
+@mixin blueprint-reset-quotation {
+  @include blueprint-reset;
+  quotes: "" "";
+  &:before,
+  &:after {
+    content: ""; } }
+
+@mixin blueprint-reset-table-cell {
+  @include blueprint-reset;
+  text-align: left;
+  font-weight: normal;
+  vertical-align: middle; }
+
+@mixin blueprint-reset-table {
+  @include blueprint-reset;
+  border-collapse: separate;
+  border-spacing: 0;
+  vertical-align: middle; }