From dafbd885881da7665ea81668d59efb484392e571 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sat, 11 Jul 2009 12:27:04 -0700 Subject: [PATCH] Fixed some incorrect logic around the deprecation warning for the +blueprint mixin and eliminated the deprecation warnings for the examples. --- examples/blueprint_scoped/src/ie.sass | 3 ++- examples/blueprint_scoped/src/print.sass | 3 ++- examples/blueprint_scoped/src/screen.sass | 3 ++- examples/blueprint_semantic/src/liquid.sass | 3 +-- examples/blueprint_semantic/src/screen.sass | 3 +-- frameworks/blueprint/stylesheets/blueprint/_screen.sass | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/examples/blueprint_scoped/src/ie.sass b/examples/blueprint_scoped/src/ie.sass index badeb777..455f7597 100644 --- a/examples/blueprint_scoped/src/ie.sass +++ b/examples/blueprint_scoped/src/ie.sass @@ -1,3 +1,4 @@ @import blueprint.sass -+blueprint-ie("body.bp") \ No newline at end of file +body.bp + +blueprint-ie(true) \ No newline at end of file diff --git a/examples/blueprint_scoped/src/print.sass b/examples/blueprint_scoped/src/print.sass index 949e578e..f08fa0fd 100644 --- a/examples/blueprint_scoped/src/print.sass +++ b/examples/blueprint_scoped/src/print.sass @@ -1,3 +1,4 @@ @import blueprint.sass -+blueprint-print("body.bp") \ No newline at end of file +body.bp + +blueprint-print(true) \ No newline at end of file diff --git a/examples/blueprint_scoped/src/screen.sass b/examples/blueprint_scoped/src/screen.sass index 400f3314..0367fa59 100644 --- a/examples/blueprint_scoped/src/screen.sass +++ b/examples/blueprint_scoped/src/screen.sass @@ -1,4 +1,5 @@ @import blueprint.sass @import compass/reset.sass -+blueprint("body.bp") \ No newline at end of file +body.bp + +blueprint(true) \ No newline at end of file diff --git a/examples/blueprint_semantic/src/liquid.sass b/examples/blueprint_semantic/src/liquid.sass index 04e500b9..85267c7c 100644 --- a/examples/blueprint_semantic/src/liquid.sass +++ b/examples/blueprint_semantic/src/liquid.sass @@ -7,9 +7,8 @@ .container +container -+blueprint-typography("body.blueprint") - body.blueprint + +blueprint-typography(true) +blueprint-scaffolding-body hr +colruler diff --git a/examples/blueprint_semantic/src/screen.sass b/examples/blueprint_semantic/src/screen.sass index 9ad7bd09..a348df2e 100644 --- a/examples/blueprint_semantic/src/screen.sass +++ b/examples/blueprint_semantic/src/screen.sass @@ -3,9 +3,8 @@ @import blueprint/modules/scaffolding.sass @import compass/reset.sass -+blueprint-typography("body.blueprint") - body.blueprint + +blueprint-typography(true) +blueprint-scaffolding-body .container +container diff --git a/frameworks/blueprint/stylesheets/blueprint/_screen.sass b/frameworks/blueprint/stylesheets/blueprint/_screen.sass index ce3509ea..824a62af 100644 --- a/frameworks/blueprint/stylesheets/blueprint/_screen.sass +++ b/frameworks/blueprint/stylesheets/blueprint/_screen.sass @@ -19,7 +19,7 @@ // You can pass the body selector as the first argument when used as a top-level mixin // +blueprint("body#page-1, body#page-2, body.a-special-page-type") =blueprint(!body_selector = "body") - @if !body_selector != "body" + @if not (!body_selector == "body" or !body_selector == true) @debug "[DEPRECATED] To specify a the selector \"#{!body_selector}\" to +blueprint, pass true as the first argument and mix it into #{!body_selector}." +blueprint-typography(!body_selector) +blueprint-utilities