diff --git a/frameworks/blueprint/stylesheets/_blueprint.scss b/frameworks/blueprint/stylesheets/_blueprint.scss index 067f84e5..38cc54ea 100644 --- a/frameworks/blueprint/stylesheets/_blueprint.scss +++ b/frameworks/blueprint/stylesheets/_blueprint.scss @@ -26,19 +26,9 @@ // body#page-1, body#page-2, body.a-special-page-type // +blueprint(true) // -// -// #### Deprecated: -// You use to be able to 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") -//-@mixin blueprint($body_selector: body) { - //@doc off - @if not ($body_selector == "body" or $body_selector == true) { - @warn "[DEPRECATED] To specify a the selector \"#{$body_selector}\" to +blueprint, pass true as the first argument and mix it into #{$body_selector}."; } - //@doc on - @include blueprint-typography($body_selector); +@mixin blueprint($nested: false) { + @include blueprint-typography($nested); @include blueprint-utilities; @include blueprint-grid; @include blueprint-debug; diff --git a/frameworks/blueprint/stylesheets/blueprint/_ie.scss b/frameworks/blueprint/stylesheets/blueprint/_ie.scss index fb3fe5f7..5d1d9679 100644 --- a/frameworks/blueprint/stylesheets/blueprint/_ie.scss +++ b/frameworks/blueprint/stylesheets/blueprint/_ie.scss @@ -26,19 +26,15 @@ //|
//| +blueprint-ie("body#page-1, body#page-2, body.a-special-page-type") //|-@mixin blueprint-ie($body_selector: body) { - @if $body_selector == true { +@mixin blueprint-ie($nested: false) { + @if $nested { @include blueprint-ie-body; - @include blueprint-ie-defaults; } - @else { - #{$body_selector} { - @include blueprint-ie-body; - @if $body_selector != "body" { - @warn "[DEPRECATED] To specify a the selector \"#{$body_selector}\" to +blueprint-ie, pass true as the first argument and mix it into #{$body_selector}."; - @include blueprint-ie-defaults; } } - @if $body_selector == "body" { - @include blueprint-ie-defaults; } } } - + @include blueprint-ie-defaults; + } @else { + body { @include blueprint-ie-body; } + @include blueprint-ie-defaults; + } +} @mixin blueprint-ie-body { text-align: center; @include blueprint-ie-hacks; } diff --git a/frameworks/blueprint/stylesheets/blueprint/_print.scss b/frameworks/blueprint/stylesheets/blueprint/_print.scss index 9dd020e7..5646bb10 100644 --- a/frameworks/blueprint/stylesheets/blueprint/_print.scss +++ b/frameworks/blueprint/stylesheets/blueprint/_print.scss @@ -16,25 +16,18 @@ // body#page-1, body#page-2, body.a-special-page-type // +blueprint-print(true) // -// Deprecated: -// You can pass the body selector as the first argument when used as a top-level mixin -//
-// +blueprint-print("body#page-1, body#page-2, body.a-special-page-type") -//-@mixin blueprint-print($body_selector: body) { - @if $body_selector == true { +@mixin blueprint-print($nested: false) { + @if $nested { @include blueprint-print-body; - @include blueprint-print-defaults; } - @else { - #{$body_selector} { - @include blueprint-print-body; - @if $body_selector != "body" { - @warn "[DEPRECATED] To specify a the selector \"#{$body_selector}\" to +blueprint-print, pass true as the first argument and mix it into #{$body_selector}."; - @include blueprint-print-defaults; } } - @if $body_selector == "body" { - @include blueprint-print-defaults; } } } + @include blueprint-print-defaults; + } @else { + body { @include blueprint-print-body; } + @include blueprint-print-defaults; + } +} -// This style is in blueprint, but I think it's annoying and it doesn't work in all browsers. +// This style is in blueprint, but it can be annoying and +// it doesn't work in all browsers. // Feel free to mix it into anchors where you want it. @mixin blueprint-show-link-urls { &:after { diff --git a/frameworks/blueprint/stylesheets/blueprint/_rtl.scss b/frameworks/blueprint/stylesheets/blueprint/_rtl.scss index 4cf281d6..62caab21 100644 --- a/frameworks/blueprint/stylesheets/blueprint/_rtl.scss +++ b/frameworks/blueprint/stylesheets/blueprint/_rtl.scss @@ -91,26 +91,15 @@ $blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns // body#page-1, body#page-2, body.a-special-page-type // +rtl-typography(true) // -// -// **Deprecated**: -// You can pass the body selector as the first argument when used as a top-level mixin -//
-// +rtl-typography("body#page-1, body#page-2, body.a-special-page-type") -//-@mixin rtl-typography($body_selector: body) { - @if $body_selector == true { - html & { - font-family: Arial, sans-serif; } +@mixin rtl-typography($nested: false) { + @if $nested { + html & { font-family: Arial, sans-serif; } @include rtl-typography-defaults; } @else { - html #{$body_selector} { - font-family: Arial, sans-serif; - @if $body_selector != "body" { - @warn "[DEPRECATED] To specify a the selector \"#{$body_selector}\" to +rtl-typography, pass true as the first argument and mix it into #{$body_selector}."; - @include rtl-typography-defaults; } } - @if $body_selector == "body" { - body { - @include rtl-typography-defaults; } } } } + html body { font-family: Arial, sans-serif; } + body { @include rtl-typography-defaults; } + } +} @mixin rtl-typography-defaults { h1, h2, h3, h4, h5, h6 { diff --git a/frameworks/blueprint/stylesheets/blueprint/_scaffolding.scss b/frameworks/blueprint/stylesheets/blueprint/_scaffolding.scss index f3b19aa8..cde9b704 100644 --- a/frameworks/blueprint/stylesheets/blueprint/_scaffolding.scss +++ b/frameworks/blueprint/stylesheets/blueprint/_scaffolding.scss @@ -15,18 +15,17 @@ // Alternatively, you can use the +blueprint-scaffolding-body and +blueprint-scaffolding-defaults // mixins to construct your own semantic style rules. -@mixin blueprint-scaffolding($body_selector: body) { - @if $body_selector != body { - #{$body_selector} { - @include blueprint-scaffolding-defaults; - } - } @else { +@mixin blueprint-scaffolding($nested: false) { + @if $nested { @include blueprint-scaffolding-defaults; + } @else { + body { @include blueprint-scaffolding-defaults; } } } -// The styles this mixin provides were deprecated in Blueprint 0.9 and is no longer part of the -// main scaffolding, but the mixin is still available if you want to use it. +// The styles this mixin provides were deprecated in Blueprint 0.9 and is no +// longer part of the main scaffolding, but the mixin is still available if +// you want to use it. @mixin blueprint-scaffolding-body { margin: 1.5em 0; } diff --git a/frameworks/blueprint/stylesheets/blueprint/_typography.scss b/frameworks/blueprint/stylesheets/blueprint/_typography.scss index c4264a97..65ac4916 100644 --- a/frameworks/blueprint/stylesheets/blueprint/_typography.scss +++ b/frameworks/blueprint/stylesheets/blueprint/_typography.scss @@ -25,27 +25,13 @@ $blueprint-font-size: 12px !default; // body#page-1, body#page-2, body.a-special-page-type // +blueprint-typography(true) // -// -// **Deprecated**: -// You can pass the body selector as the first argument when used as a top-level mixin -//
-// +blueprint-typography("body#page-1, body#page-2, body.a-special-page-type") -//-@mixin blueprint-typography($body-selector: body) { - @if $body-selector == true { +@mixin blueprint-typography($nested: false) { + @if $nested { @include blueprint-typography-body; @include blueprint-typography-defaults; } @else { - #{$body-selector} { - @include blueprint-typography-body; - @if $body-selector != body { - @warn "[DEPRECATED] To specify the selector \"#{$body-selector}\" to +blueprint-typography, pass true as the first argument and mix it into #{$body-selector}."; - @include blueprint-typography-defaults; - } - } - @if $body-selector == body { - @include blueprint-typography-defaults; - } + body { @include blueprint-typography-body; } + @include blueprint-typography-defaults; } }