Changes to blueprint mixins so that they can be mixed into the top level and avoid having scoped selectors that add to their weight.

examples/blueprint_default/stylesheets/screen.sass

@@ -2,8 +2,7 @@
 @import blueprint/modules/scaffolding.sass
 @import compass/reset.sass
 
-body
++blueprint
-  +blueprint
+// Remove the scaffolding when you're ready to start doing visual design.
-  // Remove the scaffolding when you're ready to start doing visual design.
+// Or leave it in if you're happy with how blueprint looks out-of-the-box
-  // Or leave it in if you're happy with how blueprint looks out-of-the-box
++blueprint-scaffolding
-  +blueprint-scaffolding

examples/blueprint_plugins/stylesheets/screen.sass

@@ -3,9 +3,9 @@
 @import blueprint/modules/scaffolding.sass
 @import compass/reset.sass
 
-body
+
-  +blueprint
++blueprint
-  +fancy-type
++fancy-type
-  // Remove the scaffolding when you're ready to start doing visual design.
+// Remove the scaffolding when you're ready to start doing visual design.
-  // Or leave it in if you're happy with how blueprint looks out-of-the-box
+// Or leave it in if you're happy with how blueprint looks out-of-the-box
-  +blueprint-scaffolding
++blueprint-scaffolding

examples/blueprint_scoped/stylesheets/screen.sass

@@ -1,5 +1,4 @@
 @import blueprint/screen.sass
 @import compass/reset.sass
 
-body.bp
++blueprint("body.bp")
-  +blueprint

examples/blueprint_scoped_form/stylesheets/screen.sass

@@ -1,9 +1,8 @@
 @import blueprint/screen.sass
 @import compass/reset.sass
 
-body
++blueprint-grid
-  +blueprint-grid
++blueprint-typography
-  +blueprint-typography
++blueprint-utilities
-  +blueprint-utilities
+form.blueprint
-  form.blueprint
+  +blueprint-form
-    +blueprint-form

examples/blueprint_semantic/stylesheets/screen.sass

@@ -6,17 +6,19 @@
 .container
   +container
 
++blueprint-typography("body.blueprint")
+
 body.blueprint
-  +blueprint-typography
+  +body-margins
-  html &
+
-    +body-margins
+hr
-  hr
+  +colruler
-    +colruler
+hr.space
-  hr.space
+  +colspacer
-    +colspacer
+
-  img#w3c
+img#w3c
-    :margin-top 0
+  :margin-top 0
-    :padding-top 0
+  :padding-top 0
 
 body#index
   #page-header

frameworks/blueprint/stylesheets/blueprint/_screen.sass

@@ -6,9 +6,9 @@
 @import modules/interaction.sass
 @import modules/debug.sass
 
-=blueprint
+=blueprint(!body_selector = "body")
   +blueprint-grid
-  +blueprint-typography
+  +blueprint-typography(!body_selector)
   +blueprint-utilities
   +blueprint-debug
   +blueprint-interaction

frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass

@@ -12,18 +12,18 @@
   :margin-bottom 1.5em
   :background #E5ECF9
 
-=blueprint-scaffolding
+=blueprint-scaffolding(!body_selector = "body")
-  html &
+  #{!body_selector}
     +body-margins
-    .box
+  .box
-      +box
+    +box
-    // Border on right hand side of a column. You can comment this out if you don't plan to use it.
+  // Border on right hand side of a column. You can comment this out if you don't plan to use it.
-    div.border
+  div.border
-      +border
+    +border
-    // Border with more whitespace, spans one column.
+  // Border with more whitespace, spans one column.
-    div.colborder
+  div.colborder
-      +colborder
+    +colborder
-    hr
+  hr
-      +colruler
+    +colruler
-    hr.space
+  hr.space
-      +colspacer
+    +colspacer

frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass

@@ -22,9 +22,10 @@
 =loud
   :color= !loud_color
 
-=blueprint-typography
+=blueprint-typography(!body_selector = "body")
-  +normal-text
+  #{!body_selector}
-  :font-size 75%
+    +normal-text
+    :font-size 75%
   h1
     +header-text
     :font-size 3em

frameworks/blueprint/templates/project/screen.sass

@@ -2,8 +2,7 @@
 @import blueprint/modules/scaffolding.sass
 @import compass/reset.sass
 
-body
++blueprint
-  +blueprint
+// Remove the scaffolding when you're ready to start doing visual design.
-  // Remove the scaffolding when you're ready to start doing visual design.
+// Or leave it in if you're happy with how blueprint looks out-of-the-box
-  // Or leave it in if you're happy with how blueprint looks out-of-the-box
++blueprint-scaffolding
-  +blueprint-scaffolding