From e359db1a779e899fd69ab9128353b0c970e6a208 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 29 Nov 2009 19:05:40 -0800 Subject: [PATCH] Fix some configuration defaults. --- lib/compass/configuration.rb | 3 +- lib/compass/configuration/defaults.rb | 4 ++ .../stylesheets/blueprint/css/typography.css | 43 +++++++++++++++++++ .../stylesheets/compass/css/layout.css | 4 ++ .../stylesheets/compass/css/print.css | 14 +++--- .../stylesheets/compass/css/reset.css | 14 ++++++ .../stylesheets/compass/css/utilities.css | 5 +++ .../stylesheets/image_urls/css/screen.css | 2 + 8 files changed, 80 insertions(+), 9 deletions(-) diff --git a/lib/compass/configuration.rb b/lib/compass/configuration.rb index aae4b0c3..1999c0c5 100644 --- a/lib/compass/configuration.rb +++ b/lib/compass/configuration.rb @@ -30,7 +30,8 @@ module Compass :additional_import_paths, :sass_options, :asset_host, - :asset_cache_buster + :asset_cache_buster, + :line_comments ].flatten end diff --git a/lib/compass/configuration/defaults.rb b/lib/compass/configuration/defaults.rb index c84a6d3d..54a5c43a 100644 --- a/lib/compass/configuration/defaults.rb +++ b/lib/compass/configuration/defaults.rb @@ -18,6 +18,10 @@ module Compass File.join(top_level.css_dir, "fonts") end + def default_environment + :development + end + def default_output_style if top_level.environment == :development :expanded diff --git a/test/fixtures/stylesheets/blueprint/css/typography.css b/test/fixtures/stylesheets/blueprint/css/typography.css index ab85ffc5..9fda1f3b 100644 --- a/test/fixtures/stylesheets/blueprint/css/typography.css +++ b/test/fixtures/stylesheets/blueprint/css/typography.css @@ -1,24 +1,29 @@ +/* line 26, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ body { line-height: 1.5; font-family: Helvetica Neue, Arial, Helvetica, sans-serif; color: #333333; font-size: 75%; } +/* line 58, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ h1 { font-weight: normal; color: #222222; font-size: 3em; line-height: 1; margin-bottom: 0.5em; } + /* line 63, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ h1 img { margin: 0; } +/* line 65, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ h2 { font-weight: normal; color: #222222; font-size: 2em; margin-bottom: 0.75em; } +/* line 69, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ h3 { font-weight: normal; color: #222222; @@ -26,6 +31,7 @@ h3 { line-height: 1; margin-bottom: 1em; } +/* line 74, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ h4 { font-weight: normal; color: #222222; @@ -33,6 +39,7 @@ h4 { line-height: 1.25; margin-bottom: 1.25em; } +/* line 79, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ h5 { font-weight: normal; color: #222222; @@ -40,121 +47,157 @@ h5 { font-weight: bold; margin-bottom: 1.5em; } +/* line 84, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ h6 { font-weight: normal; color: #222222; font-size: 1em; font-weight: bold; } +/* line 88, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ h2 img, h3 img, h4 img, h5 img, h6 img { margin: 0; } +/* line 90, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ p { margin: 0 0 1.5em; } + /* line 92, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ p img.left { display: inline; float: left; margin: 1.5em 1.5em 1.5em 0; padding: 0; } + /* line 96, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ p img.right { display: inline; float: right; margin: 1.5em 0 1.5em 1.5em; padding: 0; } +/* line 100, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ a { text-decoration: underline; color: #000099; } + /* line 12, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass */ a:visited { color: #000066; } + /* line 15, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass */ a:focus { color: black; } + /* line 18, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass */ a:hover { color: black; } + /* line 21, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass */ a:active { color: #cc0099; } +/* line 103, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ blockquote { margin: 1.5em; color: #666; font-style: italic; } +/* line 107, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ strong { font-weight: bold; } +/* line 109, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ em { font-style: italic; } +/* line 111, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ dfn { font-style: italic; font-weight: bold; } +/* line 114, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ sup, sub { line-height: 0; } +/* line 116, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ abbr, acronym { border-bottom: 1px dotted #666; } +/* line 118, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ address { margin: 0 0 1.5em; font-style: italic; } +/* line 121, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ del { color: #666; } +/* line 123, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ pre { margin: 1.5em 0; white-space: pre; } +/* line 126, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ pre, code, tt { font: 1em 'andale mono', 'lucida console', monospace; line-height: 1.5; } +/* line 129, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ li ul, li ol { margin: 0; } +/* line 131, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ ul, ol { margin: 0 1.5em 1.5em 0; padding-left: 3.333em; } +/* line 134, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ ul { list-style-type: disc; } +/* line 136, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ ol { list-style-type: decimal; } +/* line 138, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ dl { margin: 0 0 1.5em 0; } + /* line 140, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ dl dt { font-weight: bold; } +/* line 142, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ dd { margin-left: 1.5em; } +/* line 144, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ table { margin-bottom: 1.4em; width: 100%; } +/* line 147, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ th { font-weight: bold; } +/* line 149, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ thead th { background: #c3d9ff; } +/* line 151, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ th, td, caption { padding: 4px 10px 4px 5px; } +/* line 153, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ tr.even td { background: #e5ecf9; } +/* line 155, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ tfoot { font-style: italic; } +/* line 157, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ caption { background: #eee; } +/* line 159, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ .quiet { color: #666666; } +/* line 161, /Users/chris/Projects/compass/lib/compass/frameworks/blueprint/stylesheets/blueprint/./_typography.sass */ .loud { color: #111111; } diff --git a/test/fixtures/stylesheets/compass/css/layout.css b/test/fixtures/stylesheets/compass/css/layout.css index f461c7a0..0d66b226 100644 --- a/test/fixtures/stylesheets/compass/css/layout.css +++ b/test/fixtures/stylesheets/compass/css/layout.css @@ -1,14 +1,18 @@ +/* line 7, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass */ html, body { height: 100%; } +/* line 9, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass */ #layout { min-height: 100%; height: auto !important; height: 100%; margin-bottom: -72px; } + /* line 14, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass */ #layout #layout_footer { height: 72px; } +/* line 16, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass */ #footer { clear: both; position: relative; diff --git a/test/fixtures/stylesheets/compass/css/print.css b/test/fixtures/stylesheets/compass/css/print.css index 3dceb843..62da8047 100644 --- a/test/fixtures/stylesheets/compass/css/print.css +++ b/test/fixtures/stylesheets/compass/css/print.css @@ -1,18 +1,16 @@ +/* line 7, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/_print.sass */ .noprint, .no-print { display: none; } -address.print-only, blockquote.print-only, center.print-only, dir.print-only, div.print-only, dd.print-only, dl.print-only, dt.print-only, -fieldset.print-only, form.print-only, frameset.print-only, h1.print-only, h2.print-only, h3.print-only, h4.print-only, h5.print-only, h6.print-only, hr.print-only, -isindex.print-only, li.print-only, menu.print-only, noframes.print-only, noscript.print-only, ol.print-only, p.print-only, pre.print-only, -table.print-only, tbody.print-only, td.print-only, tfoot.print-only, th.print-only, thead.print-only, tr.print-only, ul.print-only { +/* line 11, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/_print.sass */ +address.print-only, blockquote.print-only, center.print-only, dir.print-only, div.print-only, dd.print-only, dl.print-only, dt.print-only, fieldset.print-only, form.print-only, frameset.print-only, h1.print-only, h2.print-only, h3.print-only, h4.print-only, h5.print-only, h6.print-only, hr.print-only, isindex.print-only, menu.print-only, noframes.print-only, noscript.print-only, ol.print-only, p.print-only, pre.print-only, ul.print-only { display: block; } -a.print-only, abbr.print-only, acronym.print-only, b.print-only, basefont.print-only, bdo.print-only, big.print-only, br.print-only, cite.print-only, -code.print-only, dfn.print-only, em.print-only, font.print-only, i.print-only, img.print-only, input.print-only, kbd.print-only, label.print-only, q.print-only, s.print-only, -samp.print-only, select.print-only, small.print-only, span.print-only, strike.print-only, strong.print-only, sub.print-only, sup.print-only, -textarea.print-only, tt.print-only, u.print-only, var.print-only { +/* line 14, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/_print.sass */ +a.print-only, abbr.print-only, acronym.print-only, b.print-only, basefont.print-only, bdo.print-only, big.print-only, br.print-only, cite.print-only, code.print-only, dfn.print-only, em.print-only, font.print-only, i.print-only, img.print-only, input.print-only, kbd.print-only, label.print-only, q.print-only, s.print-only, samp.print-only, select.print-only, small.print-only, span.print-only, strike.print-only, strong.print-only, sub.print-only, sup.print-only, textarea.print-only, tt.print-only, u.print-only, var.print-only { display: inline; } +/* line 17, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/_print.sass */ .print-only { display: none; } diff --git a/test/fixtures/stylesheets/compass/css/reset.css b/test/fixtures/stylesheets/compass/css/reset.css index 2df6b411..27f52ef2 100644 --- a/test/fixtures/stylesheets/compass/css/reset.css +++ b/test/fixtures/stylesheets/compass/css/reset.css @@ -1,3 +1,4 @@ +/* line 6, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -16,45 +17,58 @@ table, caption, tbody, tfoot, thead, tr, th, td { font-family: inherit; vertical-align: baseline; } +/* line 17, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass */ *:focus { outline: 0; } +/* line 20, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass */ body { line-height: 1em; color: #000; background: #fff; } +/* line 23, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass */ ol, ul { list-style: none; } /* tables still need 'cellspacing="0"' in the markup */ +/* line 27, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass */ table { border-collapse: separate; border-spacing: 0; vertical-align: middle; } +/* line 30, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } +/* line 33, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass */ q, blockquote { quotes: "" ""; } + /* line 101, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass */ q:before, q:after, blockquote:before, blockquote:after { content: ""; } +/* line 36, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass */ a img { border: none; } +/* line 4, ../sass/reset.sass */ .unregistered-only, .registered-only { display: none; } +/* line 125, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass */ body.registered a.registered-only, body.registered abbr.registered-only, body.registered acronym.registered-only, body.registered b.registered-only, body.registered basefont.registered-only, body.registered bdo.registered-only, body.registered big.registered-only, body.registered br.registered-only, body.registered cite.registered-only, body.registered code.registered-only, body.registered dfn.registered-only, body.registered em.registered-only, body.registered font.registered-only, body.registered i.registered-only, body.registered img.registered-only, body.registered input.registered-only, body.registered kbd.registered-only, body.registered label.registered-only, body.registered q.registered-only, body.registered s.registered-only, body.registered samp.registered-only, body.registered select.registered-only, body.registered small.registered-only, body.registered span.registered-only, body.registered strike.registered-only, body.registered strong.registered-only, body.registered sub.registered-only, body.registered sup.registered-only, body.registered textarea.registered-only, body.registered tt.registered-only, body.registered u.registered-only, body.registered var.registered-only { display: inline; } +/* line 130, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass */ body.registered address.registered-only, body.registered blockquote.registered-only, body.registered center.registered-only, body.registered dir.registered-only, body.registered div.registered-only, body.registered dd.registered-only, body.registered dl.registered-only, body.registered dt.registered-only, body.registered fieldset.registered-only, body.registered form.registered-only, body.registered frameset.registered-only, body.registered h1.registered-only, body.registered h2.registered-only, body.registered h3.registered-only, body.registered h4.registered-only, body.registered h5.registered-only, body.registered h6.registered-only, body.registered hr.registered-only, body.registered isindex.registered-only, body.registered menu.registered-only, body.registered noframes.registered-only, body.registered noscript.registered-only, body.registered ol.registered-only, body.registered p.registered-only, body.registered pre.registered-only, body.registered ul.registered-only { display: block; } +/* line 125, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass */ body.unregistered a.unregistered-only, body.unregistered abbr.unregistered-only, body.unregistered acronym.unregistered-only, body.unregistered b.unregistered-only, body.unregistered basefont.unregistered-only, body.unregistered bdo.unregistered-only, body.unregistered big.unregistered-only, body.unregistered br.unregistered-only, body.unregistered cite.unregistered-only, body.unregistered code.unregistered-only, body.unregistered dfn.unregistered-only, body.unregistered em.unregistered-only, body.unregistered font.unregistered-only, body.unregistered i.unregistered-only, body.unregistered img.unregistered-only, body.unregistered input.unregistered-only, body.unregistered kbd.unregistered-only, body.unregistered label.unregistered-only, body.unregistered q.unregistered-only, body.unregistered s.unregistered-only, body.unregistered samp.unregistered-only, body.unregistered select.unregistered-only, body.unregistered small.unregistered-only, body.unregistered span.unregistered-only, body.unregistered strike.unregistered-only, body.unregistered strong.unregistered-only, body.unregistered sub.unregistered-only, body.unregistered sup.unregistered-only, body.unregistered textarea.unregistered-only, body.unregistered tt.unregistered-only, body.unregistered u.unregistered-only, body.unregistered var.unregistered-only { display: inline; } +/* line 130, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass */ body.unregistered address.unregistered-only, body.unregistered blockquote.unregistered-only, body.unregistered center.unregistered-only, body.unregistered dir.unregistered-only, body.unregistered div.unregistered-only, body.unregistered dd.unregistered-only, body.unregistered dl.unregistered-only, body.unregistered dt.unregistered-only, body.unregistered fieldset.unregistered-only, body.unregistered form.unregistered-only, body.unregistered frameset.unregistered-only, body.unregistered h1.unregistered-only, body.unregistered h2.unregistered-only, body.unregistered h3.unregistered-only, body.unregistered h4.unregistered-only, body.unregistered h5.unregistered-only, body.unregistered h6.unregistered-only, body.unregistered hr.unregistered-only, body.unregistered isindex.unregistered-only, body.unregistered menu.unregistered-only, body.unregistered noframes.unregistered-only, body.unregistered noscript.unregistered-only, body.unregistered ol.unregistered-only, body.unregistered p.unregistered-only, body.unregistered pre.unregistered-only, body.unregistered ul.unregistered-only { display: block; } diff --git a/test/fixtures/stylesheets/compass/css/utilities.css b/test/fixtures/stylesheets/compass/css/utilities.css index b8b12855..3fee5a16 100644 --- a/test/fixtures/stylesheets/compass/css/utilities.css +++ b/test/fixtures/stylesheets/compass/css/utilities.css @@ -1,11 +1,15 @@ +/* line 3, ../sass/utilities.sass */ .clearfix { overflow: hidden; display: inline-block; } + /* line 5, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/./_hacks.sass */ .clearfix { display: block; } +/* line 5, ../sass/utilities.sass */ .pie-clearfix { display: inline-block; } + /* line 17, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass */ .pie-clearfix:after { content: " "; display: block; @@ -13,5 +17,6 @@ clear: both; overflow: hidden; visibility: hidden; } + /* line 5, /Users/chris/Projects/compass/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/./_hacks.sass */ .pie-clearfix { display: block; } diff --git a/test/fixtures/stylesheets/image_urls/css/screen.css b/test/fixtures/stylesheets/image_urls/css/screen.css index c7de0c65..23306441 100644 --- a/test/fixtures/stylesheets/image_urls/css/screen.css +++ b/test/fixtures/stylesheets/image_urls/css/screen.css @@ -1,3 +1,5 @@ +/* line 1, ../sass/screen.sass */ .showgrid { background-image: url('http://assets2.example.com/images/grid.png?busted=true'); } +/* line 4, ../sass/screen.sass */ .inlinegrid { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAUEAYAAACv1qP4AAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAZ0lEQVRYw+3QwQ2AIBAFUTEUwI3+uzN7gDscsIgxEuO8An52J11X73OudfxMraXkzHfO3Y98nQEhA0IGhAwIGRAyIGRAyICQASEDQgaEDAgZEDIgZEDIgJABoZzSGK3tPuN9ERFP7Nw4fg+c5g8V1wAAAABJRU5ErkJggg=='); }