From 2c3e57bec60d9d6743d0e2c73520f099663875db Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Mon, 8 Dec 2008 09:53:28 -0800 Subject: [PATCH] Created top level imports for all frameworks. This change broke backwards compatibility for YUI, where users should now @import yui.sass instead of yui/screen.sass --- examples/blueprint_default/stylesheets/ie.sass | 2 +- examples/blueprint_default/stylesheets/print.sass | 2 +- examples/blueprint_default/stylesheets/screen.sass | 2 +- examples/blueprint_plugins/stylesheets/ie.sass | 2 +- examples/blueprint_plugins/stylesheets/print.sass | 2 +- examples/blueprint_plugins/stylesheets/screen.sass | 2 +- examples/blueprint_scoped/stylesheets/ie.sass | 2 +- examples/blueprint_scoped/stylesheets/print.sass | 2 +- examples/blueprint_scoped/stylesheets/screen.sass | 2 +- examples/blueprint_scoped_form/stylesheets/ie.sass | 2 +- examples/blueprint_scoped_form/stylesheets/print.sass | 2 +- examples/blueprint_scoped_form/stylesheets/screen.sass | 2 +- examples/blueprint_semantic/stylesheets/ie.sass | 2 +- examples/blueprint_semantic/stylesheets/liquid.sass | 2 +- examples/blueprint_semantic/stylesheets/print.sass | 2 +- examples/blueprint_semantic/stylesheets/screen.sass | 2 +- examples/yui/stylesheets/screen.sass | 2 +- frameworks/blueprint/stylesheets/_blueprint.sass | 3 +++ .../blueprint/stylesheets/blueprint/modules/_liquid.sass | 2 +- frameworks/blueprint/templates/project/ie.sass | 2 +- frameworks/blueprint/templates/project/print.sass | 2 +- frameworks/blueprint/templates/project/screen.sass | 2 +- frameworks/compass/stylesheets/_compass.sass | 1 + frameworks/yui/stylesheets/_yui.sass | 7 +++++++ frameworks/yui/stylesheets/yui/_screen.sass | 7 ------- frameworks/yui/templates/project/screen.sass | 2 +- 26 files changed, 33 insertions(+), 29 deletions(-) create mode 100644 frameworks/blueprint/stylesheets/_blueprint.sass create mode 100644 frameworks/compass/stylesheets/_compass.sass create mode 100644 frameworks/yui/stylesheets/_yui.sass delete mode 100644 frameworks/yui/stylesheets/yui/_screen.sass diff --git a/examples/blueprint_default/stylesheets/ie.sass b/examples/blueprint_default/stylesheets/ie.sass index f948dbd1..7af9162b 100644 --- a/examples/blueprint_default/stylesheets/ie.sass +++ b/examples/blueprint_default/stylesheets/ie.sass @@ -1,3 +1,3 @@ -@import blueprint/ie.sass +@import blueprint.sass +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 642d3e12..8e5d49d8 100644 --- a/examples/blueprint_default/stylesheets/print.sass +++ b/examples/blueprint_default/stylesheets/print.sass @@ -1,3 +1,3 @@ -@import blueprint/print.sass +@import blueprint.sass +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 54ce845d..0ca30638 100644 --- a/examples/blueprint_default/stylesheets/screen.sass +++ b/examples/blueprint_default/stylesheets/screen.sass @@ -1,4 +1,4 @@ -@import blueprint/screen.sass +@import blueprint.sass @import blueprint/modules/scaffolding.sass @import compass/reset.sass diff --git a/examples/blueprint_plugins/stylesheets/ie.sass b/examples/blueprint_plugins/stylesheets/ie.sass index f948dbd1..7af9162b 100644 --- a/examples/blueprint_plugins/stylesheets/ie.sass +++ b/examples/blueprint_plugins/stylesheets/ie.sass @@ -1,3 +1,3 @@ -@import blueprint/ie.sass +@import blueprint.sass +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 642d3e12..8e5d49d8 100644 --- a/examples/blueprint_plugins/stylesheets/print.sass +++ b/examples/blueprint_plugins/stylesheets/print.sass @@ -1,3 +1,3 @@ -@import blueprint/print.sass +@import blueprint.sass +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 aef8bdc7..4350dddb 100644 --- a/examples/blueprint_plugins/stylesheets/screen.sass +++ b/examples/blueprint_plugins/stylesheets/screen.sass @@ -1,4 +1,4 @@ -@import blueprint/screen.sass +@import blueprint.sass @import blueprint/modules/fancy_type.sass @import blueprint/modules/scaffolding.sass @import compass/reset.sass diff --git a/examples/blueprint_scoped/stylesheets/ie.sass b/examples/blueprint_scoped/stylesheets/ie.sass index 959b1c2a..badeb777 100644 --- a/examples/blueprint_scoped/stylesheets/ie.sass +++ b/examples/blueprint_scoped/stylesheets/ie.sass @@ -1,3 +1,3 @@ -@import blueprint/ie.sass +@import blueprint.sass +blueprint-ie("body.bp") \ No newline at end of file diff --git a/examples/blueprint_scoped/stylesheets/print.sass b/examples/blueprint_scoped/stylesheets/print.sass index 394f6881..949e578e 100644 --- a/examples/blueprint_scoped/stylesheets/print.sass +++ b/examples/blueprint_scoped/stylesheets/print.sass @@ -1,3 +1,3 @@ -@import blueprint/print.sass +@import blueprint.sass +blueprint-print("body.bp") \ No newline at end of file diff --git a/examples/blueprint_scoped/stylesheets/screen.sass b/examples/blueprint_scoped/stylesheets/screen.sass index 902e5447..400f3314 100644 --- a/examples/blueprint_scoped/stylesheets/screen.sass +++ b/examples/blueprint_scoped/stylesheets/screen.sass @@ -1,4 +1,4 @@ -@import blueprint/screen.sass +@import blueprint.sass @import compass/reset.sass +blueprint("body.bp") \ No newline at end of file diff --git a/examples/blueprint_scoped_form/stylesheets/ie.sass b/examples/blueprint_scoped_form/stylesheets/ie.sass index f948dbd1..7af9162b 100644 --- a/examples/blueprint_scoped_form/stylesheets/ie.sass +++ b/examples/blueprint_scoped_form/stylesheets/ie.sass @@ -1,3 +1,3 @@ -@import blueprint/ie.sass +@import blueprint.sass +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 642d3e12..8e5d49d8 100644 --- a/examples/blueprint_scoped_form/stylesheets/print.sass +++ b/examples/blueprint_scoped_form/stylesheets/print.sass @@ -1,3 +1,3 @@ -@import blueprint/print.sass +@import blueprint.sass +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 5c612064..fe065088 100644 --- a/examples/blueprint_scoped_form/stylesheets/screen.sass +++ b/examples/blueprint_scoped_form/stylesheets/screen.sass @@ -1,4 +1,4 @@ -@import blueprint/screen.sass +@import blueprint.sass @import compass/reset.sass +blueprint-grid diff --git a/examples/blueprint_semantic/stylesheets/ie.sass b/examples/blueprint_semantic/stylesheets/ie.sass index f948dbd1..7af9162b 100644 --- a/examples/blueprint_semantic/stylesheets/ie.sass +++ b/examples/blueprint_semantic/stylesheets/ie.sass @@ -1,3 +1,3 @@ -@import blueprint/ie.sass +@import blueprint.sass +blueprint-ie \ No newline at end of file diff --git a/examples/blueprint_semantic/stylesheets/liquid.sass b/examples/blueprint_semantic/stylesheets/liquid.sass index cca04a18..776c2abe 100644 --- a/examples/blueprint_semantic/stylesheets/liquid.sass +++ b/examples/blueprint_semantic/stylesheets/liquid.sass @@ -1,4 +1,4 @@ -@import blueprint/screen.sass +@import blueprint.sass @import blueprint/modules/fancy_type.sass @import blueprint/modules/scaffolding.sass @import blueprint/modules/liquid.sass diff --git a/examples/blueprint_semantic/stylesheets/print.sass b/examples/blueprint_semantic/stylesheets/print.sass index 642d3e12..8e5d49d8 100644 --- a/examples/blueprint_semantic/stylesheets/print.sass +++ b/examples/blueprint_semantic/stylesheets/print.sass @@ -1,3 +1,3 @@ -@import blueprint/print.sass +@import blueprint.sass +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 a8620009..a841d012 100644 --- a/examples/blueprint_semantic/stylesheets/screen.sass +++ b/examples/blueprint_semantic/stylesheets/screen.sass @@ -1,4 +1,4 @@ -@import blueprint/screen.sass +@import blueprint.sass @import blueprint/modules/fancy_type.sass @import blueprint/modules/scaffolding.sass @import compass/reset.sass diff --git a/examples/yui/stylesheets/screen.sass b/examples/yui/stylesheets/screen.sass index f2020203..cdff4c9c 100644 --- a/examples/yui/stylesheets/screen.sass +++ b/examples/yui/stylesheets/screen.sass @@ -1,4 +1,4 @@ -@import yui/screen.sass +@import yui.sass @import compass/reset.sass +yui diff --git a/frameworks/blueprint/stylesheets/_blueprint.sass b/frameworks/blueprint/stylesheets/_blueprint.sass new file mode 100644 index 00000000..8bd2084e --- /dev/null +++ b/frameworks/blueprint/stylesheets/_blueprint.sass @@ -0,0 +1,3 @@ +@import blueprint/screen.sass +@import blueprint/print.sass +@import blueprint/ie.sass diff --git a/frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass b/frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass index c27f8ecb..3f552ca2 100644 --- a/frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass +++ b/frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass @@ -27,7 +27,7 @@ // ----- // To use: // This module is a REPLACEMENT for the grid module. Simply import it: -// @import blueprint/screen.sass +// @import blueprint.sass // @import blueprint/modules/liquid.sass // ------------------------------------------------------------------- diff --git a/frameworks/blueprint/templates/project/ie.sass b/frameworks/blueprint/templates/project/ie.sass index f948dbd1..7af9162b 100644 --- a/frameworks/blueprint/templates/project/ie.sass +++ b/frameworks/blueprint/templates/project/ie.sass @@ -1,3 +1,3 @@ -@import blueprint/ie.sass +@import blueprint.sass +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 642d3e12..8e5d49d8 100644 --- a/frameworks/blueprint/templates/project/print.sass +++ b/frameworks/blueprint/templates/project/print.sass @@ -1,3 +1,3 @@ -@import blueprint/print.sass +@import blueprint.sass +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 54ce845d..0ca30638 100644 --- a/frameworks/blueprint/templates/project/screen.sass +++ b/frameworks/blueprint/templates/project/screen.sass @@ -1,4 +1,4 @@ -@import blueprint/screen.sass +@import blueprint.sass @import blueprint/modules/scaffolding.sass @import compass/reset.sass diff --git a/frameworks/compass/stylesheets/_compass.sass b/frameworks/compass/stylesheets/_compass.sass new file mode 100644 index 00000000..79a50ab1 --- /dev/null +++ b/frameworks/compass/stylesheets/_compass.sass @@ -0,0 +1 @@ +@import compass/utilities.sass \ No newline at end of file diff --git a/frameworks/yui/stylesheets/_yui.sass b/frameworks/yui/stylesheets/_yui.sass new file mode 100644 index 00000000..acc2006e --- /dev/null +++ b/frameworks/yui/stylesheets/_yui.sass @@ -0,0 +1,7 @@ +@import yui/modules/base.sass +@import yui/modules/fonts.sass +@import yui/modules/grids.sass +=yui + +yui-base + +yui-base-fonts + +yui-grids \ No newline at end of file diff --git a/frameworks/yui/stylesheets/yui/_screen.sass b/frameworks/yui/stylesheets/yui/_screen.sass deleted file mode 100644 index 2b78b098..00000000 --- a/frameworks/yui/stylesheets/yui/_screen.sass +++ /dev/null @@ -1,7 +0,0 @@ -@import modules/base.sass -@import modules/fonts.sass -@import modules/grids.sass -=yui - +yui-base - +yui-base-fonts - +yui-grids \ No newline at end of file diff --git a/frameworks/yui/templates/project/screen.sass b/frameworks/yui/templates/project/screen.sass index c15d93e9..40dab7fa 100644 --- a/frameworks/yui/templates/project/screen.sass +++ b/frameworks/yui/templates/project/screen.sass @@ -1,4 +1,4 @@ -@import yui/screen.sass +@import yui.sass @import compass/reset.sass +yui