From b82966e03f63acdeb47c21e6dee87ae2d2d9cc0b Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 24 Aug 2008 00:04:31 -0700 Subject: [PATCH] bug fixes found now that things are starting to work. --- .../stylesheets/blueprint/_screen.sass | 1 - .../blueprint/modules/_utilities.sass | 38 +++++++++++++++++++ .../stylesheets/compass/_utilities.sass | 38 ------------------- lib/compass/commands/install_rails.rb | 2 +- 4 files changed, 39 insertions(+), 40 deletions(-) create mode 100644 frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass diff --git a/frameworks/blueprint/stylesheets/blueprint/_screen.sass b/frameworks/blueprint/stylesheets/blueprint/_screen.sass index 2a1eec7e..430bebd4 100644 --- a/frameworks/blueprint/stylesheets/blueprint/_screen.sass +++ b/frameworks/blueprint/stylesheets/blueprint/_screen.sass @@ -1,5 +1,4 @@ @import modules/colors -@import modules/reset @import modules/grid @import modules/typography @import modules/utilities diff --git a/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass b/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass new file mode 100644 index 00000000..b2323c5d --- /dev/null +++ b/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass @@ -0,0 +1,38 @@ +@import compass/utilities + +// Most of these utility classes are not "semantic". If you use them, +// you are mixing your content and presentation. For shame! + +=blueprint-utilities + // Regular clearing apply to column that should drop below previous ones. + .clear + :clear both + // turn off text wrapping for the element. + .nowrap + +nowrap + // Apply to an element that has floated children to make the bottom + // of the element fall _below_ the floated children. + .clearfix + +clearfix + .small + :font-size .8em + :margin-bottom 1.875em + :line-height 1.875em + .large + :font-size 1.2em + :line-height 2.5em + :margin-bottom 1.25em + .first + :margin-left 0 + :padding-left 0 + .last + :margin-right 0 + :padding-right 0 + .top + :margin-top 0 + :padding-top 0 + .bottom + :margin-bottom 0 + :padding-bottom 0 + .print-only + :display none diff --git a/frameworks/compass/stylesheets/compass/_utilities.sass b/frameworks/compass/stylesheets/compass/_utilities.sass index 41fa60c9..8ad12b7d 100644 --- a/frameworks/compass/stylesheets/compass/_utilities.sass +++ b/frameworks/compass/stylesheets/compass/_utilities.sass @@ -14,41 +14,3 @@ =nowrap :white-space nowrap - - -// Most of these utility classes are not "semantic". If you use them, -// you are mixing your content and presentation. For shame! - -=blueprint-utilities - // Regular clearing apply to column that should drop below previous ones. - .clear - :clear both - // turn off text wrapping for the element. - .nowrap - +nowrap - // Apply to an element that has floated children to make the bottom - // of the element fall _below_ the floated children. - .clearfix - +clearfix - .small - :font-size .8em - :margin-bottom 1.875em - :line-height 1.875em - .large - :font-size 1.2em - :line-height 2.5em - :margin-bottom 1.25em - .first - :margin-left 0 - :padding-left 0 - .last - :margin-right 0 - :padding-right 0 - .top - :margin-top 0 - :padding-top 0 - .bottom - :margin-bottom 0 - :padding-bottom 0 - .print-only - :display none diff --git a/lib/compass/commands/install_rails.rb b/lib/compass/commands/install_rails.rb index 38d9230e..cd558991 100644 --- a/lib/compass/commands/install_rails.rb +++ b/lib/compass/commands/install_rails.rb @@ -56,7 +56,7 @@ end %head %meta{'http-equiv' => "content-type", :content => "text/html;charset=UTF-8"} %title= @browser_title || 'Default Browser Title' - = stylesheet_link_tag '#{stylesheet_prefix}screen.css', :media => 'print' + = stylesheet_link_tag '#{stylesheet_prefix}screen.css', :media => 'screen, projection' = stylesheet_link_tag '#{stylesheet_prefix}print.css', :media => 'print' /[if IE] = stylesheet_link_tag '#{stylesheet_prefix}ie.css', :media => 'screen, projection'