From 1fcd0c446a4619f86435230ee081749880cbe85f Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Wed, 1 Oct 2008 22:58:30 -0700 Subject: [PATCH] Use explicit sass imports to get better error reporting in the case of a missing file or installation problem. --- examples/blueprint_default/stylesheets/ie.sass | 2 +- examples/blueprint_default/stylesheets/print.sass | 2 +- examples/blueprint_default/stylesheets/screen.sass | 6 +++--- examples/blueprint_plugins/stylesheets/ie.sass | 2 +- examples/blueprint_plugins/stylesheets/print.sass | 2 +- examples/blueprint_plugins/stylesheets/screen.sass | 8 ++++---- examples/blueprint_scoped/stylesheets/ie.sass | 2 +- examples/blueprint_scoped/stylesheets/print.sass | 2 +- examples/blueprint_scoped/stylesheets/screen.sass | 4 ++-- examples/blueprint_scoped_form/stylesheets/ie.sass | 2 +- .../blueprint_scoped_form/stylesheets/print.sass | 2 +- .../blueprint_scoped_form/stylesheets/screen.sass | 4 ++-- examples/blueprint_semantic/stylesheets/ie.sass | 2 +- examples/blueprint_semantic/stylesheets/print.sass | 2 +- .../blueprint_semantic/stylesheets/screen.sass | 8 ++++---- examples/compass/stylesheets/utilities.sass | 10 +++++----- examples/yui_default/stylesheets/screen.sass | 4 ++-- .../blueprint/stylesheets/blueprint/_screen.sass | 14 +++++++------- .../stylesheets/blueprint/modules/_form.sass | 2 +- .../stylesheets/blueprint/modules/_grid.sass | 2 +- .../blueprint/modules/_scaffolding.sass | 2 +- .../stylesheets/blueprint/modules/_typography.sass | 4 ++-- .../stylesheets/blueprint/modules/_utilities.sass | 3 ++- frameworks/blueprint/templates/project/ie.sass | 2 +- frameworks/blueprint/templates/project/print.sass | 2 +- frameworks/blueprint/templates/project/screen.sass | 6 +++--- .../compass/stylesheets/compass/_utilities.sass | 10 +++++----- .../stylesheets/compass/utilities/_general.sass | 4 ++-- .../stylesheets/compass/utilities/_links.sass | 6 +++--- .../stylesheets/compass/utilities/_lists.sass | 6 +++--- .../stylesheets/compass/utilities/_tables.sass | 2 +- .../stylesheets/compass/utilities/_text.sass | 2 +- frameworks/compass/templates/project/screen.sass | 2 +- frameworks/yui/stylesheets/yui/_screen.sass | 4 ++-- frameworks/yui/templates/project/screen.sass | 4 ++-- 35 files changed, 71 insertions(+), 70 deletions(-) diff --git a/examples/blueprint_default/stylesheets/ie.sass b/examples/blueprint_default/stylesheets/ie.sass index 9bb82459..3cf4b9f9 100644 --- a/examples/blueprint_default/stylesheets/ie.sass +++ b/examples/blueprint_default/stylesheets/ie.sass @@ -1,4 +1,4 @@ -@import blueprint/ie +@import blueprint/ie.sass body +blueprint-ie \ No newline at end of file diff --git a/examples/blueprint_default/stylesheets/print.sass b/examples/blueprint_default/stylesheets/print.sass index f825831b..942379c0 100644 --- a/examples/blueprint_default/stylesheets/print.sass +++ b/examples/blueprint_default/stylesheets/print.sass @@ -1,4 +1,4 @@ -@import blueprint/print +@import blueprint/print.sass body +blueprint-print \ No newline at end of file diff --git a/examples/blueprint_default/stylesheets/screen.sass b/examples/blueprint_default/stylesheets/screen.sass index 57d3cf55..65f82a01 100644 --- a/examples/blueprint_default/stylesheets/screen.sass +++ b/examples/blueprint_default/stylesheets/screen.sass @@ -1,6 +1,6 @@ -@import blueprint/screen -@import modules/scaffolding -@import compass/reset +@import blueprint/screen.sass +@import modules/scaffolding.sass +@import compass/reset.sass html +reset-html diff --git a/examples/blueprint_plugins/stylesheets/ie.sass b/examples/blueprint_plugins/stylesheets/ie.sass index 9bb82459..3cf4b9f9 100644 --- a/examples/blueprint_plugins/stylesheets/ie.sass +++ b/examples/blueprint_plugins/stylesheets/ie.sass @@ -1,4 +1,4 @@ -@import blueprint/ie +@import blueprint/ie.sass body +blueprint-ie \ No newline at end of file diff --git a/examples/blueprint_plugins/stylesheets/print.sass b/examples/blueprint_plugins/stylesheets/print.sass index f825831b..942379c0 100644 --- a/examples/blueprint_plugins/stylesheets/print.sass +++ b/examples/blueprint_plugins/stylesheets/print.sass @@ -1,4 +1,4 @@ -@import blueprint/print +@import blueprint/print.sass body +blueprint-print \ No newline at end of file diff --git a/examples/blueprint_plugins/stylesheets/screen.sass b/examples/blueprint_plugins/stylesheets/screen.sass index 32a9edbf..71cbdfbb 100644 --- a/examples/blueprint_plugins/stylesheets/screen.sass +++ b/examples/blueprint_plugins/stylesheets/screen.sass @@ -1,7 +1,7 @@ -@import blueprint/screen -@import modules/fancy_type -@import modules/scaffolding -@import compass/reset +@import blueprint/screen.sass +@import modules/fancy_type.sass +@import modules/scaffolding.sass +@import compass/reset.sass html +reset-html diff --git a/examples/blueprint_scoped/stylesheets/ie.sass b/examples/blueprint_scoped/stylesheets/ie.sass index 9bb82459..3cf4b9f9 100644 --- a/examples/blueprint_scoped/stylesheets/ie.sass +++ b/examples/blueprint_scoped/stylesheets/ie.sass @@ -1,4 +1,4 @@ -@import blueprint/ie +@import blueprint/ie.sass body +blueprint-ie \ No newline at end of file diff --git a/examples/blueprint_scoped/stylesheets/print.sass b/examples/blueprint_scoped/stylesheets/print.sass index f825831b..942379c0 100644 --- a/examples/blueprint_scoped/stylesheets/print.sass +++ b/examples/blueprint_scoped/stylesheets/print.sass @@ -1,4 +1,4 @@ -@import blueprint/print +@import blueprint/print.sass body +blueprint-print \ No newline at end of file diff --git a/examples/blueprint_scoped/stylesheets/screen.sass b/examples/blueprint_scoped/stylesheets/screen.sass index 7cb9440c..b7541f55 100644 --- a/examples/blueprint_scoped/stylesheets/screen.sass +++ b/examples/blueprint_scoped/stylesheets/screen.sass @@ -1,5 +1,5 @@ -@import blueprint/screen -@import compass/reset +@import blueprint/screen.sass +@import compass/reset.sass html +reset-html diff --git a/examples/blueprint_scoped_form/stylesheets/ie.sass b/examples/blueprint_scoped_form/stylesheets/ie.sass index 9bb82459..3cf4b9f9 100644 --- a/examples/blueprint_scoped_form/stylesheets/ie.sass +++ b/examples/blueprint_scoped_form/stylesheets/ie.sass @@ -1,4 +1,4 @@ -@import blueprint/ie +@import blueprint/ie.sass body +blueprint-ie \ No newline at end of file diff --git a/examples/blueprint_scoped_form/stylesheets/print.sass b/examples/blueprint_scoped_form/stylesheets/print.sass index f825831b..942379c0 100644 --- a/examples/blueprint_scoped_form/stylesheets/print.sass +++ b/examples/blueprint_scoped_form/stylesheets/print.sass @@ -1,4 +1,4 @@ -@import blueprint/print +@import blueprint/print.sass body +blueprint-print \ No newline at end of file diff --git a/examples/blueprint_scoped_form/stylesheets/screen.sass b/examples/blueprint_scoped_form/stylesheets/screen.sass index cd74cef2..2fc19360 100644 --- a/examples/blueprint_scoped_form/stylesheets/screen.sass +++ b/examples/blueprint_scoped_form/stylesheets/screen.sass @@ -1,5 +1,5 @@ -@import blueprint/screen -@import compass/reset +@import blueprint/screen.sass +@import compass/reset.sass html +reset-html diff --git a/examples/blueprint_semantic/stylesheets/ie.sass b/examples/blueprint_semantic/stylesheets/ie.sass index 9bb82459..3cf4b9f9 100644 --- a/examples/blueprint_semantic/stylesheets/ie.sass +++ b/examples/blueprint_semantic/stylesheets/ie.sass @@ -1,4 +1,4 @@ -@import blueprint/ie +@import blueprint/ie.sass body +blueprint-ie \ No newline at end of file diff --git a/examples/blueprint_semantic/stylesheets/print.sass b/examples/blueprint_semantic/stylesheets/print.sass index f825831b..942379c0 100644 --- a/examples/blueprint_semantic/stylesheets/print.sass +++ b/examples/blueprint_semantic/stylesheets/print.sass @@ -1,4 +1,4 @@ -@import blueprint/print +@import blueprint/print.sass body +blueprint-print \ No newline at end of file diff --git a/examples/blueprint_semantic/stylesheets/screen.sass b/examples/blueprint_semantic/stylesheets/screen.sass index d91d01be..4ee999aa 100644 --- a/examples/blueprint_semantic/stylesheets/screen.sass +++ b/examples/blueprint_semantic/stylesheets/screen.sass @@ -1,7 +1,7 @@ -@import blueprint/screen -@import blueprint/modules/fancy_type -@import blueprint/modules/scaffolding -@import compass/reset +@import blueprint/screen.sass +@import blueprint/modules/fancy_type.sass +@import blueprint/modules/scaffolding.sass +@import compass/reset.sass html +reset-html diff --git a/examples/compass/stylesheets/utilities.sass b/examples/compass/stylesheets/utilities.sass index 0c037705..021ab847 100644 --- a/examples/compass/stylesheets/utilities.sass +++ b/examples/compass/stylesheets/utilities.sass @@ -1,8 +1,8 @@ -@import compass/reset -@import compass/utilities -@import yui/modules/base -@import blueprint/modules/grid -@import blueprint/modules/scaffolding +@import compass/reset.sass +@import compass/utilities.sass +@import yui/modules/base.sass +@import blueprint/modules/grid.sass +@import blueprint/modules/scaffolding.sass html +reset-html diff --git a/examples/yui_default/stylesheets/screen.sass b/examples/yui_default/stylesheets/screen.sass index 59bbbf65..1acf75ef 100644 --- a/examples/yui_default/stylesheets/screen.sass +++ b/examples/yui_default/stylesheets/screen.sass @@ -1,5 +1,5 @@ -@import yui/screen -@import compass/reset +@import yui/screen.sass +@import compass/reset.sass html +reset-html diff --git a/frameworks/blueprint/stylesheets/blueprint/_screen.sass b/frameworks/blueprint/stylesheets/blueprint/_screen.sass index 430bebd4..97de7b66 100644 --- a/frameworks/blueprint/stylesheets/blueprint/_screen.sass +++ b/frameworks/blueprint/stylesheets/blueprint/_screen.sass @@ -1,10 +1,10 @@ -@import modules/colors -@import modules/grid -@import modules/typography -@import modules/utilities -@import modules/form -@import modules/interaction -@import modules/debug +@import modules/colors.sass +@import modules/grid.sass +@import modules/typography.sass +@import modules/utilities.sass +@import modules/form.sass +@import modules/interaction.sass +@import modules/debug.sass =blueprint +blueprint-grid diff --git a/frameworks/blueprint/stylesheets/blueprint/modules/_form.sass b/frameworks/blueprint/stylesheets/blueprint/modules/_form.sass index d2f1df2f..25043127 100644 --- a/frameworks/blueprint/stylesheets/blueprint/modules/_form.sass +++ b/frameworks/blueprint/stylesheets/blueprint/modules/_form.sass @@ -1,4 +1,4 @@ -@import colors +@import colors.sass =blueprint-form label diff --git a/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass b/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass index afc7bb4d..71b24a00 100755 --- a/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass +++ b/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass @@ -15,7 +15,7 @@ // * subtraction.com/archives/2007/0318_oh_yeeaahh.php // -------------------------------------------------------------- -@import compass/utilities/general/clearfix +@import compass/utilities/general/clearfix.sass // Main layout grid, edit these parameters to build your grid and container sizes. !layout_grid_columns = 24 diff --git a/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass b/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass index 8671b096..cf56be4c 100644 --- a/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass +++ b/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass @@ -1,4 +1,4 @@ -@import grid +@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. diff --git a/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass b/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass index 5968bdb2..4e7f885e 100644 --- a/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass +++ b/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass @@ -1,5 +1,5 @@ -@import colors -@import compass/utilities/links/link_colors +@import colors.sass +@import compass/utilities/links/link_colors.sass =normal-text :font-family "Helvetica Neue", Helvetica, Arial, sans-serif diff --git a/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass b/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass index ae06c8e9..7892948d 100644 --- a/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass +++ b/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass @@ -1,4 +1,5 @@ -@import compass/utilities/text/nowrap, compass/utilities/general/clearfix +@import compass/utilities/text/nowrap.sass +@import compass/utilities/general/clearfix.sass // Most of these utility classes are not "semantic". If you use them, // you are mixing your content and presentation. For shame! diff --git a/frameworks/blueprint/templates/project/ie.sass b/frameworks/blueprint/templates/project/ie.sass index 9bb82459..3cf4b9f9 100644 --- a/frameworks/blueprint/templates/project/ie.sass +++ b/frameworks/blueprint/templates/project/ie.sass @@ -1,4 +1,4 @@ -@import blueprint/ie +@import blueprint/ie.sass body +blueprint-ie \ No newline at end of file diff --git a/frameworks/blueprint/templates/project/print.sass b/frameworks/blueprint/templates/project/print.sass index f825831b..942379c0 100644 --- a/frameworks/blueprint/templates/project/print.sass +++ b/frameworks/blueprint/templates/project/print.sass @@ -1,4 +1,4 @@ -@import blueprint/print +@import blueprint/print.sass body +blueprint-print \ No newline at end of file diff --git a/frameworks/blueprint/templates/project/screen.sass b/frameworks/blueprint/templates/project/screen.sass index a4a0bbb8..93fb2a18 100644 --- a/frameworks/blueprint/templates/project/screen.sass +++ b/frameworks/blueprint/templates/project/screen.sass @@ -1,6 +1,6 @@ -@import blueprint/screen -@import blueprint/modules/scaffolding -@import compass/reset +@import blueprint/screen.sass +@import blueprint/modules/scaffolding.sass +@import compass/reset.sass html +reset-html diff --git a/frameworks/compass/stylesheets/compass/_utilities.sass b/frameworks/compass/stylesheets/compass/_utilities.sass index 29db150e..4040ad3e 100644 --- a/frameworks/compass/stylesheets/compass/_utilities.sass +++ b/frameworks/compass/stylesheets/compass/_utilities.sass @@ -1,5 +1,5 @@ -@import utilities/general -@import utilities/links -@import utilities/lists -@import utilities/tables -@import utilities/text +@import utilities/general.sass +@import utilities/links.sass +@import utilities/lists.sass +@import utilities/tables.sass +@import utilities/text.sass diff --git a/frameworks/compass/stylesheets/compass/utilities/_general.sass b/frameworks/compass/stylesheets/compass/utilities/_general.sass index b7c06519..373237a2 100644 --- a/frameworks/compass/stylesheets/compass/utilities/_general.sass +++ b/frameworks/compass/stylesheets/compass/utilities/_general.sass @@ -1,3 +1,3 @@ -@import general/clearfix -@import general/tag_cloud +@import general/clearfix.sass +@import general/tag_cloud.sass diff --git a/frameworks/compass/stylesheets/compass/utilities/_links.sass b/frameworks/compass/stylesheets/compass/utilities/_links.sass index 1dca1dcb..afd4e369 100644 --- a/frameworks/compass/stylesheets/compass/utilities/_links.sass +++ b/frameworks/compass/stylesheets/compass/utilities/_links.sass @@ -1,3 +1,3 @@ -@import links/hover_link -@import links/link_colors -@import links/unstyled_link \ No newline at end of file +@import links/hover_link.sass +@import links/link_colors.sass +@import links/unstyled_link.sass \ No newline at end of file diff --git a/frameworks/compass/stylesheets/compass/utilities/_lists.sass b/frameworks/compass/stylesheets/compass/utilities/_lists.sass index 99ce7eac..8e309778 100644 --- a/frameworks/compass/stylesheets/compass/utilities/_lists.sass +++ b/frameworks/compass/stylesheets/compass/utilities/_lists.sass @@ -1,3 +1,3 @@ -@import lists/horizontal_list -@import lists/inline_list -@import lists/bullets +@import lists/horizontal_list.sass +@import lists/inline_list.sass +@import lists/bullets.sass diff --git a/frameworks/compass/stylesheets/compass/utilities/_tables.sass b/frameworks/compass/stylesheets/compass/utilities/_tables.sass index 1d5d112f..adca8898 100644 --- a/frameworks/compass/stylesheets/compass/utilities/_tables.sass +++ b/frameworks/compass/stylesheets/compass/utilities/_tables.sass @@ -1 +1 @@ -@import tables/alternating_rows_and_columns \ No newline at end of file +@import tables/alternating_rows_and_columns.sass \ No newline at end of file diff --git a/frameworks/compass/stylesheets/compass/utilities/_text.sass b/frameworks/compass/stylesheets/compass/utilities/_text.sass index 4c7a28f3..c7e0c6c4 100644 --- a/frameworks/compass/stylesheets/compass/utilities/_text.sass +++ b/frameworks/compass/stylesheets/compass/utilities/_text.sass @@ -1 +1 @@ -@import text/nowrap +@import text/nowrap.sass diff --git a/frameworks/compass/templates/project/screen.sass b/frameworks/compass/templates/project/screen.sass index fe6007a4..0c95faa5 100644 --- a/frameworks/compass/templates/project/screen.sass +++ b/frameworks/compass/templates/project/screen.sass @@ -1,7 +1,7 @@ /* Welcome to Compass. We'll show you the way, but you'll have to get there on your own. In this file you should write (or centralize your imports) the main styles. -@import compass/reset +@import compass/reset.sass html +reset-html diff --git a/frameworks/yui/stylesheets/yui/_screen.sass b/frameworks/yui/stylesheets/yui/_screen.sass index 38dcb5ab..3053bf1f 100644 --- a/frameworks/yui/stylesheets/yui/_screen.sass +++ b/frameworks/yui/stylesheets/yui/_screen.sass @@ -1,5 +1,5 @@ -@import modules/base -@import modules/fonts +@import modules/base.sass +@import modules/fonts.sass =yui +yui-base +yui-fonts \ No newline at end of file diff --git a/frameworks/yui/templates/project/screen.sass b/frameworks/yui/templates/project/screen.sass index d6bec653..44ad304a 100644 --- a/frameworks/yui/templates/project/screen.sass +++ b/frameworks/yui/templates/project/screen.sass @@ -1,5 +1,5 @@ -@import yui/screen -@import compass/reset +@import yui/screen.sass +@import compass/reset.sass html +reset-html