chriseppstein-compass 0.1.1 → 0.3.0

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

@@ -1,9 +1,28 @@
 @import grid.sass
-/*
-  The styles contained here are meant to provide for an attractive experience out of the box
-  and are meant to be removed once custom visual design begins.
+// The styles contained here are meant to provide for an attractive experience out of the box
+// and are expected to be removed once custom visual design begins.
 
-=body-margins
+// The +blueprint-scaffolding mixin must be mixed into the top level of your stylesheet.
+// However, you can customize the body selector if you wish to control the scope
+// of this mixin. Examples:
+// Apply to any page including the stylesheet:
+//   +blueprint-scaffolding
+// Scoped by a single presentational body class:
+//   +blueprint-scaffolding("body.blueprint")
+// Semantically:
+//   +blueprint-scaffolding("body#page-1, body#page-2, body.a-special-page-type")
+//   Alternatively, you can use the +blueprint-scaffolding-body and +blueprint-scaffolding-defaults
+//   mixins to construct your own semantic style rules.
+
+=blueprint-scaffolding(!body_selector = "body")
+  #{!body_selector}
+    +blueprint-scaffolding-body
+    @if !body_selector != "body"
+      +blueprint-scaffolding-defaults
+  @if !body_selector == "body"
+    +blueprint-scaffolding-defaults
+
+=blueprint-scaffolding-body
   :margin 1.5em 0
 
 // Mixin +box to create a padded box inside a column.
@@ -12,18 +31,16 @@
   :margin-bottom 1.5em
   :background #E5ECF9
 
-=blueprint-scaffolding
-  html &
-    +body-margins
-    .box
-      +box
-    // Border on right hand side of a column. You can comment this out if you don't plan to use it.
-    div.border
-      +border
-    // Border with more whitespace, spans one column.
-    div.colborder
-      +colborder
-    hr
-      +colruler
-    hr.space
-      +colspacer
+=blueprint-scaffolding-defaults
+  .box
+    +box
+  // Border on right hand side of a column. You can comment this out if you don't plan to use it.
+  div.border
+    +border
+  // Border with more whitespace, spans one column.
+  div.colborder
+    +colborder
+  hr
+    +colruler
+  hr.space
+    +colspacer

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

@@ -1,9 +1,29 @@
 @import colors.sass
 @import compass/utilities/links/link_colors.sass
 
-!blueprint_font_family ||= "Helvetica Neue", Helvetica, Arial, sans-serif
+!blueprint_font_family       ||= "Helvetica Neue", Helvetica, Arial, sans-serif
 !blueprint_fixed_font_family ||= 'andale mono', 'lucida console', monospace
 
+// The +blueprint-typography mixin must be mixed into the top level of your stylesheet.
+// However, you can customize the body selector if you wish to control the scope
+// of this mixin. Examples:
+// Apply to any page including the stylesheet:
+//   +blueprint-typography
+// Scoped by a single presentational body class:
+//   +blueprint-typography("body.blueprint")
+// Semantically:
+//   +blueprint-typography("body#page-1, body#page-2, body.a-special-page-type")
+//   Alternatively, you can use the +blueprint-typography-body and +blueprint-typography-defaults
+//   mixins to construct your own semantic style rules.
+
+=blueprint-typography(!body_selector = "body")
+  #{!body_selector}
+    +blueprint-typography-body
+    @if !body_selector != "body"
+      +blueprint-typography-defaults
+  @if !body_selector == "body"
+    +blueprint-typography-defaults
+
 =normal-text
   :font-family= !blueprint_font_family
   :color= !font_color
@@ -22,9 +42,11 @@
 =loud
   :color= !loud_color
 
-=blueprint-typography
+=blueprint-typography-body
   +normal-text
   :font-size 75%
+
+=blueprint-typography-defaults
   h1
     +header-text
     :font-size 3em

data/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass

@@ -35,5 +35,3 @@
   .bottom
     :margin-bottom 0
     :padding-bottom 0
-  .print-only
-    :display none

data/frameworks/blueprint/templates/project/ie.sass

@@ -1,4 +1,3 @@
 @import blueprint/ie.sass
 
-body
-  +blueprint-ie
++blueprint-ie

data/frameworks/blueprint/templates/project/print.sass

@@ -1,4 +1,3 @@
 @import blueprint/print.sass
 
-body
-  +blueprint-print
++blueprint-print

data/frameworks/blueprint/templates/project/screen.sass

@@ -2,8 +2,7 @@
 @import blueprint/modules/scaffolding.sass
 @import compass/reset.sass
 
-body
-  +blueprint
-  // 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
-  +blueprint-scaffolding
++blueprint
+// 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
++blueprint-scaffolding

data/frameworks/compass/stylesheets/compass/utilities/_print.sass

@@ -0,0 +1,24 @@
+/* Classes that are useful for controlling what gets printed.
+   You must mix +print-utilities into your print stylesheet
+   and +print-utilities("screen") into your screen stylesheet.
+   Note: these aren't semantic.
+=print-utilities(!media = "print")
+  @if !media == "print"
+    .noprint,
+    .no-print
+      :display none
+    address, blockquote, center, dir, div, dd, dl, dt,
+    fieldset, form, frameset, h1, h2, h3, h4, h5, h6, hr,
+    isindex, li, menu, noframes, noscript, ol, p, pre,
+    table, tbody, td, tfoot, th, thead, tr, ul
+      &.print-only
+        :display block
+    a, abbr, acronym, b, basefont, bdo, big, br, cite,
+    code, dfn, em, font, i, img, input, kbd, label, q, s,
+    samp, select, small, span, strike, strong, sub, sup,
+    textarea, tt, u, var
+      &.print-only
+        :display inline
+  @else
+    .print-only
+      :display none

data/test/compass_test.rb

@@ -4,7 +4,7 @@ require 'compass'
 
 class CompassTest < Test::Unit::TestCase
   def setup
-    setup_fixtures :default, :yui, :empty
+    setup_fixtures :blueprint, :yui, :empty
     @original_options = Sass::Plugin.options
   end
   
@@ -16,7 +16,7 @@ class CompassTest < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_fixtures :default, :yui, :empty
+    teardown_fixtures :blueprint, :yui, :empty
     Sass::Plugin.options = @original_options
   end
 
@@ -34,11 +34,12 @@ class CompassTest < Test::Unit::TestCase
     end
   end
 
-  def test_default
-    with_templates(:default) do
-      each_css_file(tempfile_loc(:default)) do |css_file|
-        assert_no_errors css_file, :default
+  def test_blueprint
+    with_templates(:blueprint) do
+      each_css_file(tempfile_loc(:blueprint)) do |css_file|
+        assert_no_errors css_file, :blueprint
       end
+      assert_renders_correctly :typography
     end
   end
   def test_yui

data/test/fixtures/stylesheets/blueprint/css/typography.css

@@ -0,0 +1,158 @@
+
+
+body {
+  font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
+  color: #333333;
+  font-size: 75%; }
+
+h1 {
+  font-weight: normal;
+  color: #222222;
+  font-size: 3em;
+  line-height: 1;
+  margin-bottom: 0.5em; }
+  h1 img {
+    margin: 0; }
+
+h2 {
+  font-weight: normal;
+  color: #222222;
+  font-size: 2em;
+  margin-bottom: 0.75em; }
+
+h3 {
+  font-weight: normal;
+  color: #222222;
+  font-size: 1.5em;
+  line-height: 1;
+  margin-bottom: 1em; }
+
+h4 {
+  font-weight: normal;
+  color: #222222;
+  font-size: 1.2em;
+  line-height: 1.25;
+  margin-bottom: 1.25em;
+  height: 1.25em; }
+
+h5 {
+  font-weight: normal;
+  color: #222222;
+  font-size: 1em;
+  font-weight: bold;
+  margin-bottom: 1.5em; }
+
+h6 {
+  font-weight: normal;
+  color: #222222;
+  font-size: 1em;
+  font-weight: bold; }
+
+h2 img, h3 img, h4 img, h5 img, h6 img {
+  margin: 0; }
+
+p {
+  margin: 0 0 1.5em; }
+  p img {
+    float: left;
+    margin: 1.5em 1.5em 1.5em 0;
+    padding: 0; }
+    p img.right {
+      float: right;
+      margin: 1.5em 0 1.5em 1.5em; }
+
+a {
+  text-decoration: underline;
+  color: #000099; }
+  a:visited {
+    color: #000066; }
+  a:focus {
+    color: black; }
+  a:hover {
+    color: black; }
+  a:active {
+    color: #cc0099; }
+
+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, code {
+  margin: 1.5em 0;
+  white-space: pre;
+  font: 1em 'andale mono', 'lucida console', monospace;
+  line-height: 1.5; }
+
+tt {
+  font: 1em 'andale mono', 'lucida console', monospace;
+  line-height: 1.5; }
+
+li ul, li ol {
+  margin: 0 1.5em; }
+
+ul {
+  margin: 0 1.5em 1.5em 1.5em;
+  list-style-type: disc; }
+
+ol {
+  margin: 0 1.5em 1.5em 1.5em;
+  list-style-type: decimal; }
+
+dl {
+  margin: 0 0 1.5em 0; }
+  dl dt {
+    font-weight: bold; }
+
+dd {
+  margin-left: 1.5em; }
+
+table {
+  margin-bottom: 1.4em;
+  width: 100%; }
+
+th {
+  font-weight: bold;
+  background: #C3D9FF;
+  padding: 4px 10px 4px 5px; }
+
+td {
+  padding: 4px 10px 4px 5px; }
+
+tr.even td {
+  background: #E5ECF9; }
+
+tfoot {
+  font-style: italic; }
+
+caption {
+  background: #eee; }
+
+.quiet {
+  color: #666666; }
+
+.loud {
+  color: #111111; }

data/test/fixtures/stylesheets/{default → blueprint}/sass/ie.sass

@@ -1,4 +1,3 @@
 @import blueprint/ie
 
-body
-  +blueprint-ie
++blueprint-ie

data/test/fixtures/stylesheets/{default → blueprint}/sass/print.sass

@@ -1,4 +1,3 @@
 @import blueprint/print
 
-body
-  +blueprint-print
++blueprint-print

data/test/fixtures/stylesheets/blueprint/sass/screen.sass

@@ -0,0 +1,17 @@
+@import blueprint/screen
+@import compass/reset
+
++blueprint
+#main.container
+  #top
+    +column(24, last)
+  #middle
+    +column(24, last)
+    #left
+      +column(6)
+    #content
+      +column(12)
+    #right
+      +column(6, last)
+  #bottom
+    +column(24, last)

data/test/fixtures/stylesheets/blueprint/sass/typography.sass

@@ -0,0 +1,3 @@
+@import blueprint/modules/typography.sass
+
++blueprint-typography

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chriseppstein-compass
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-05 00:00:00 -08:00
+date: 2008-12-06 00:00:00 -08:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,6 +142,7 @@ files:
 - frameworks/compass/stylesheets/compass/utilities/_general.sass
 - frameworks/compass/stylesheets/compass/utilities/_links.sass
 - frameworks/compass/stylesheets/compass/utilities/_lists.sass
+- frameworks/compass/stylesheets/compass/utilities/_print.sass
 - frameworks/compass/stylesheets/compass/utilities/_tables.sass
 - frameworks/compass/stylesheets/compass/utilities/_text.sass
 - frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass
@@ -199,9 +200,11 @@ files:
 - Rakefile
 - README.markdown
 - test/compass_test.rb
-- test/fixtures/stylesheets/default/sass/ie.sass
-- test/fixtures/stylesheets/default/sass/print.sass
-- test/fixtures/stylesheets/default/sass/screen.sass
+- test/fixtures/stylesheets/blueprint/css/typography.css
+- test/fixtures/stylesheets/blueprint/sass/ie.sass
+- test/fixtures/stylesheets/blueprint/sass/print.sass
+- test/fixtures/stylesheets/blueprint/sass/screen.sass
+- test/fixtures/stylesheets/blueprint/sass/typography.sass
 - test/fixtures/stylesheets/yui/css/mixins.css
 - test/fixtures/stylesheets/yui/sass/base.sass
 - test/fixtures/stylesheets/yui/sass/fonts.sass

data/test/fixtures/stylesheets/default/sass/screen.sass

@@ -1,18 +0,0 @@
-@import blueprint/screen
-@import compass/reset
-
-body
-  +blueprint
-  #main.container
-    #top
-      +column(24, last)
-    #middle
-      +column(24, last)
-      #left
-        +column(6)
-      #content
-        +column(12)
-      #right
-        +column(6, last)
-    #bottom
-      +column(24, last)