diff --git a/frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/_screen.sass b/frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/_screen.sass index f0dc9050..68ef06bc 100644 --- a/frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/_screen.sass +++ b/frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/_screen.sass @@ -1,2 +1,2 @@ @warn "DEPRECATED: blueprint/screen.sass will be removed. Please @import \"blueprint\" instead." -@import blueprint.sass +@import blueprint diff --git a/frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/_typography.sass b/frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/_typography.sass index 4e85e6c6..bdb89b6e 100644 --- a/frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/_typography.sass +++ b/frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/_typography.sass @@ -1,162 +1,2 @@ -@import colors.sass -@import compass/utilities/links/link-colors -@import compass/utilities/general/float - -!blueprint_font_family ||= "Helvetica Neue, Arial, Helvetica, sans-serif" -!blueprint_fixed_font_family ||= "'andale mono', 'lucida console', monospace" -!blueprint_font_size ||= 12px - -// Usage examples: -// As a top-level mixin, apply to any page that includes the stylesheet: -// +blueprint-typography -// Scoped by a presentational class: -// body.blueprint -// +blueprint-typography(true) -// Scoped by semantic selectors: -// 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") -=blueprint-typography(!body_selector = "body") - @if !body_selector == true - +blueprint-typography-body - +blueprint-typography-defaults - @else - #{!body_selector} - +blueprint-typography-body - @if !body_selector != "body" - @warn "[DEPRECATED] To specify a the selector \"#{!body_selector}\" to +blueprint-typography, pass true as the first argument and mix it into #{!body_selector}." - +blueprint-typography-defaults - @if !body_selector == "body" - +blueprint-typography-defaults - -=normal-text - font-family= !blueprint_font_family - color= !font_color - -=fixed-width-text - font= 1em !blueprint_fixed_font_family - line-height: 1.5 - -=header-text - font-weight: normal - color= !header_color - -=quiet - color= !quiet_color - -=loud - color= !loud_color - -=blueprint-typography-body(!font_size = !blueprint_font_size) - line-height: 1.5 - +normal-text - font-size= 100% * !font_size / 16px - -=blueprint-typography-defaults - h1 - +header-text - font-size: 3em - line-height: 1 - margin-bottom: 0.5em - img - margin: 0 - h2 - +header-text - font-size: 2em - margin-bottom: 0.75em - h3 - +header-text - font-size: 1.5em - line-height: 1 - margin-bottom: 1em - h4 - +header-text - font-size: 1.2em - line-height: 1.25 - margin-bottom: 1.25em - h5 - +header-text - font-size: 1em - font-weight: bold - margin-bottom: 1.5em - h6 - +header-text - font-size: 1em - font-weight: bold - h2 img, h3 img, h4 img, h5 img, h6 img - margin: 0 - p - margin: 0 0 1.5em - img.left - +float-left - margin: 1.5em 1.5em 1.5em 0 - padding: 0 - img.right - +float-right - margin: 1.5em 0 1.5em 1.5em - padding: 0 - a - text-decoration: underline - +link-colors(!link_color, !link_hover_color, !link_active_color, !link_visited_color, !link_focus_color) - blockquote - margin: 1.5em - color: #666 - font-style: italic - strong - font-weight: bold - em - font-style: italic - dfn - font-style: italic - font-weight: bold - sup, sub - line-height: 0 - abbr, acronym - border-bottom: 1px dotted #666 - address - margin: 0 0 1.5em - font-style: italic - del - color: #666 - pre - margin: 1.5em 0 - white-space: pre - pre, code, tt - +fixed-width-text - li - ul, ol - margin: 0 - ul, ol - margin: 0 1.5em 1.5em 0 - padding-left: 3.333em - ul - list-style-type: disc - ol - list-style-type: decimal - dl - margin: 0 0 1.5em 0 - dt - font-weight: bold - dd - margin-left: 1.5em - table - margin-bottom: 1.4em - width: 100% - th - font-weight: bold - thead th - background= !blueprint_table_header_color - th, td, caption - padding: 4px 10px 4px 5px - tr.even td - background= !blueprint_table_stripe_color - tfoot - font-style: italic - caption - background: #eee - .quiet - +quiet - .loud - +loud +@warn "DEPRECATED: blueprint/typography.sass will be removed. Please @import \"blueprint/typography\" instead." +@import "blueprint/typography" \ No newline at end of file