From f4fa7436c63bc8cacec614d1079cfc344c3a1753 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 20 Apr 2012 14:37:40 -0400 Subject: [PATCH] Move bourbon back into the directory with scss so it can be imported properly --- envs/common.py | 2 +- {bourbon => static/css/bourbon}/_bourbon.scss | 0 {bourbon => static/css/bourbon}/addons/_button.scss | 0 {bourbon => static/css/bourbon}/addons/_clearfix.scss | 0 {bourbon => static/css/bourbon}/addons/_font-family.scss | 0 {bourbon => static/css/bourbon}/addons/_html5-input-types.scss | 0 {bourbon => static/css/bourbon}/addons/_position.scss | 0 {bourbon => static/css/bourbon}/addons/_timing-functions.scss | 0 {bourbon => static/css/bourbon}/css3/_animation.scss | 0 {bourbon => static/css/bourbon}/css3/_appearance.scss | 0 {bourbon => static/css/bourbon}/css3/_background-image.scss | 0 {bourbon => static/css/bourbon}/css3/_background-size.scss | 0 {bourbon => static/css/bourbon}/css3/_border-image.scss | 0 {bourbon => static/css/bourbon}/css3/_border-radius.scss | 0 {bourbon => static/css/bourbon}/css3/_box-shadow.scss | 0 {bourbon => static/css/bourbon}/css3/_box-sizing.scss | 0 {bourbon => static/css/bourbon}/css3/_columns.scss | 0 {bourbon => static/css/bourbon}/css3/_flex-box.scss | 0 {bourbon => static/css/bourbon}/css3/_inline-block.scss | 0 {bourbon => static/css/bourbon}/css3/_linear-gradient.scss | 0 {bourbon => static/css/bourbon}/css3/_radial-gradient.scss | 0 {bourbon => static/css/bourbon}/css3/_transform.scss | 0 {bourbon => static/css/bourbon}/css3/_transition.scss | 0 {bourbon => static/css/bourbon}/css3/_user-select.scss | 0 .../css/bourbon}/functions/_deprecated-webkit-gradient.scss | 0 {bourbon => static/css/bourbon}/functions/_flex-grid.scss | 0 {bourbon => static/css/bourbon}/functions/_grid-width.scss | 0 {bourbon => static/css/bourbon}/functions/_linear-gradient.scss | 0 {bourbon => static/css/bourbon}/functions/_modular-scale.scss | 0 {bourbon => static/css/bourbon}/functions/_radial-gradient.scss | 0 .../css/bourbon}/functions/_render-gradients.scss | 0 {bourbon => static/css/bourbon}/functions/_tint-shade.scss | 0 {bourbon => static/css/bourbon}/lib/bourbon.rb | 0 {bourbon => static/css/bourbon}/lib/bourbon/sass_extensions.rb | 0 .../css/bourbon}/lib/bourbon/sass_extensions/functions.rb | 0 .../bourbon}/lib/bourbon/sass_extensions/functions/compact.rb | 0 36 files changed, 1 insertion(+), 1 deletion(-) rename {bourbon => static/css/bourbon}/_bourbon.scss (100%) rename {bourbon => static/css/bourbon}/addons/_button.scss (100%) rename {bourbon => static/css/bourbon}/addons/_clearfix.scss (100%) rename {bourbon => static/css/bourbon}/addons/_font-family.scss (100%) rename {bourbon => static/css/bourbon}/addons/_html5-input-types.scss (100%) rename {bourbon => static/css/bourbon}/addons/_position.scss (100%) rename {bourbon => static/css/bourbon}/addons/_timing-functions.scss (100%) rename {bourbon => static/css/bourbon}/css3/_animation.scss (100%) rename {bourbon => static/css/bourbon}/css3/_appearance.scss (100%) rename {bourbon => static/css/bourbon}/css3/_background-image.scss (100%) rename {bourbon => static/css/bourbon}/css3/_background-size.scss (100%) rename {bourbon => static/css/bourbon}/css3/_border-image.scss (100%) rename {bourbon => static/css/bourbon}/css3/_border-radius.scss (100%) rename {bourbon => static/css/bourbon}/css3/_box-shadow.scss (100%) rename {bourbon => static/css/bourbon}/css3/_box-sizing.scss (100%) rename {bourbon => static/css/bourbon}/css3/_columns.scss (100%) rename {bourbon => static/css/bourbon}/css3/_flex-box.scss (100%) rename {bourbon => static/css/bourbon}/css3/_inline-block.scss (100%) rename {bourbon => static/css/bourbon}/css3/_linear-gradient.scss (100%) rename {bourbon => static/css/bourbon}/css3/_radial-gradient.scss (100%) rename {bourbon => static/css/bourbon}/css3/_transform.scss (100%) rename {bourbon => static/css/bourbon}/css3/_transition.scss (100%) rename {bourbon => static/css/bourbon}/css3/_user-select.scss (100%) rename {bourbon => static/css/bourbon}/functions/_deprecated-webkit-gradient.scss (100%) rename {bourbon => static/css/bourbon}/functions/_flex-grid.scss (100%) rename {bourbon => static/css/bourbon}/functions/_grid-width.scss (100%) rename {bourbon => static/css/bourbon}/functions/_linear-gradient.scss (100%) rename {bourbon => static/css/bourbon}/functions/_modular-scale.scss (100%) rename {bourbon => static/css/bourbon}/functions/_radial-gradient.scss (100%) rename {bourbon => static/css/bourbon}/functions/_render-gradients.scss (100%) rename {bourbon => static/css/bourbon}/functions/_tint-shade.scss (100%) rename {bourbon => static/css/bourbon}/lib/bourbon.rb (100%) rename {bourbon => static/css/bourbon}/lib/bourbon/sass_extensions.rb (100%) rename {bourbon => static/css/bourbon}/lib/bourbon/sass_extensions/functions.rb (100%) rename {bourbon => static/css/bourbon}/lib/bourbon/sass_extensions/functions/compact.rb (100%) diff --git a/envs/common.py b/envs/common.py index d7135c781b..e51185a36e 100644 --- a/envs/common.py +++ b/envs/common.py @@ -250,7 +250,7 @@ PIPELINE_COMPILERS = [ 'pipeline.compilers.sass.SASSCompiler' ] -PIPELINE_SASS_ARGUMENTS = '-r {proj_dir}/bourbon/lib/bourbon.rb'.format(proj_dir=PROJECT_ROOT) +PIPELINE_SASS_ARGUMENTS = '-r {proj_dir}/static/css/bourbon/lib/bourbon.rb'.format(proj_dir=PROJECT_ROOT) PIPELINE_CSS_COMPRESSOR = None diff --git a/bourbon/_bourbon.scss b/static/css/bourbon/_bourbon.scss similarity index 100% rename from bourbon/_bourbon.scss rename to static/css/bourbon/_bourbon.scss diff --git a/bourbon/addons/_button.scss b/static/css/bourbon/addons/_button.scss similarity index 100% rename from bourbon/addons/_button.scss rename to static/css/bourbon/addons/_button.scss diff --git a/bourbon/addons/_clearfix.scss b/static/css/bourbon/addons/_clearfix.scss similarity index 100% rename from bourbon/addons/_clearfix.scss rename to static/css/bourbon/addons/_clearfix.scss diff --git a/bourbon/addons/_font-family.scss b/static/css/bourbon/addons/_font-family.scss similarity index 100% rename from bourbon/addons/_font-family.scss rename to static/css/bourbon/addons/_font-family.scss diff --git a/bourbon/addons/_html5-input-types.scss b/static/css/bourbon/addons/_html5-input-types.scss similarity index 100% rename from bourbon/addons/_html5-input-types.scss rename to static/css/bourbon/addons/_html5-input-types.scss diff --git a/bourbon/addons/_position.scss b/static/css/bourbon/addons/_position.scss similarity index 100% rename from bourbon/addons/_position.scss rename to static/css/bourbon/addons/_position.scss diff --git a/bourbon/addons/_timing-functions.scss b/static/css/bourbon/addons/_timing-functions.scss similarity index 100% rename from bourbon/addons/_timing-functions.scss rename to static/css/bourbon/addons/_timing-functions.scss diff --git a/bourbon/css3/_animation.scss b/static/css/bourbon/css3/_animation.scss similarity index 100% rename from bourbon/css3/_animation.scss rename to static/css/bourbon/css3/_animation.scss diff --git a/bourbon/css3/_appearance.scss b/static/css/bourbon/css3/_appearance.scss similarity index 100% rename from bourbon/css3/_appearance.scss rename to static/css/bourbon/css3/_appearance.scss diff --git a/bourbon/css3/_background-image.scss b/static/css/bourbon/css3/_background-image.scss similarity index 100% rename from bourbon/css3/_background-image.scss rename to static/css/bourbon/css3/_background-image.scss diff --git a/bourbon/css3/_background-size.scss b/static/css/bourbon/css3/_background-size.scss similarity index 100% rename from bourbon/css3/_background-size.scss rename to static/css/bourbon/css3/_background-size.scss diff --git a/bourbon/css3/_border-image.scss b/static/css/bourbon/css3/_border-image.scss similarity index 100% rename from bourbon/css3/_border-image.scss rename to static/css/bourbon/css3/_border-image.scss diff --git a/bourbon/css3/_border-radius.scss b/static/css/bourbon/css3/_border-radius.scss similarity index 100% rename from bourbon/css3/_border-radius.scss rename to static/css/bourbon/css3/_border-radius.scss diff --git a/bourbon/css3/_box-shadow.scss b/static/css/bourbon/css3/_box-shadow.scss similarity index 100% rename from bourbon/css3/_box-shadow.scss rename to static/css/bourbon/css3/_box-shadow.scss diff --git a/bourbon/css3/_box-sizing.scss b/static/css/bourbon/css3/_box-sizing.scss similarity index 100% rename from bourbon/css3/_box-sizing.scss rename to static/css/bourbon/css3/_box-sizing.scss diff --git a/bourbon/css3/_columns.scss b/static/css/bourbon/css3/_columns.scss similarity index 100% rename from bourbon/css3/_columns.scss rename to static/css/bourbon/css3/_columns.scss diff --git a/bourbon/css3/_flex-box.scss b/static/css/bourbon/css3/_flex-box.scss similarity index 100% rename from bourbon/css3/_flex-box.scss rename to static/css/bourbon/css3/_flex-box.scss diff --git a/bourbon/css3/_inline-block.scss b/static/css/bourbon/css3/_inline-block.scss similarity index 100% rename from bourbon/css3/_inline-block.scss rename to static/css/bourbon/css3/_inline-block.scss diff --git a/bourbon/css3/_linear-gradient.scss b/static/css/bourbon/css3/_linear-gradient.scss similarity index 100% rename from bourbon/css3/_linear-gradient.scss rename to static/css/bourbon/css3/_linear-gradient.scss diff --git a/bourbon/css3/_radial-gradient.scss b/static/css/bourbon/css3/_radial-gradient.scss similarity index 100% rename from bourbon/css3/_radial-gradient.scss rename to static/css/bourbon/css3/_radial-gradient.scss diff --git a/bourbon/css3/_transform.scss b/static/css/bourbon/css3/_transform.scss similarity index 100% rename from bourbon/css3/_transform.scss rename to static/css/bourbon/css3/_transform.scss diff --git a/bourbon/css3/_transition.scss b/static/css/bourbon/css3/_transition.scss similarity index 100% rename from bourbon/css3/_transition.scss rename to static/css/bourbon/css3/_transition.scss diff --git a/bourbon/css3/_user-select.scss b/static/css/bourbon/css3/_user-select.scss similarity index 100% rename from bourbon/css3/_user-select.scss rename to static/css/bourbon/css3/_user-select.scss diff --git a/bourbon/functions/_deprecated-webkit-gradient.scss b/static/css/bourbon/functions/_deprecated-webkit-gradient.scss similarity index 100% rename from bourbon/functions/_deprecated-webkit-gradient.scss rename to static/css/bourbon/functions/_deprecated-webkit-gradient.scss diff --git a/bourbon/functions/_flex-grid.scss b/static/css/bourbon/functions/_flex-grid.scss similarity index 100% rename from bourbon/functions/_flex-grid.scss rename to static/css/bourbon/functions/_flex-grid.scss diff --git a/bourbon/functions/_grid-width.scss b/static/css/bourbon/functions/_grid-width.scss similarity index 100% rename from bourbon/functions/_grid-width.scss rename to static/css/bourbon/functions/_grid-width.scss diff --git a/bourbon/functions/_linear-gradient.scss b/static/css/bourbon/functions/_linear-gradient.scss similarity index 100% rename from bourbon/functions/_linear-gradient.scss rename to static/css/bourbon/functions/_linear-gradient.scss diff --git a/bourbon/functions/_modular-scale.scss b/static/css/bourbon/functions/_modular-scale.scss similarity index 100% rename from bourbon/functions/_modular-scale.scss rename to static/css/bourbon/functions/_modular-scale.scss diff --git a/bourbon/functions/_radial-gradient.scss b/static/css/bourbon/functions/_radial-gradient.scss similarity index 100% rename from bourbon/functions/_radial-gradient.scss rename to static/css/bourbon/functions/_radial-gradient.scss diff --git a/bourbon/functions/_render-gradients.scss b/static/css/bourbon/functions/_render-gradients.scss similarity index 100% rename from bourbon/functions/_render-gradients.scss rename to static/css/bourbon/functions/_render-gradients.scss diff --git a/bourbon/functions/_tint-shade.scss b/static/css/bourbon/functions/_tint-shade.scss similarity index 100% rename from bourbon/functions/_tint-shade.scss rename to static/css/bourbon/functions/_tint-shade.scss diff --git a/bourbon/lib/bourbon.rb b/static/css/bourbon/lib/bourbon.rb similarity index 100% rename from bourbon/lib/bourbon.rb rename to static/css/bourbon/lib/bourbon.rb diff --git a/bourbon/lib/bourbon/sass_extensions.rb b/static/css/bourbon/lib/bourbon/sass_extensions.rb similarity index 100% rename from bourbon/lib/bourbon/sass_extensions.rb rename to static/css/bourbon/lib/bourbon/sass_extensions.rb diff --git a/bourbon/lib/bourbon/sass_extensions/functions.rb b/static/css/bourbon/lib/bourbon/sass_extensions/functions.rb similarity index 100% rename from bourbon/lib/bourbon/sass_extensions/functions.rb rename to static/css/bourbon/lib/bourbon/sass_extensions/functions.rb diff --git a/bourbon/lib/bourbon/sass_extensions/functions/compact.rb b/static/css/bourbon/lib/bourbon/sass_extensions/functions/compact.rb similarity index 100% rename from bourbon/lib/bourbon/sass_extensions/functions/compact.rb rename to static/css/bourbon/lib/bourbon/sass_extensions/functions/compact.rb