Move bourbon back into the directory with scss so it can be imported properly

f4fa7436 · Calen Pennington · 7dcc6b38 · f4fa7436 · f4fa7436 · f4fa7436
Commit f4fa7436 authored Apr 20, 2012 by Calen Pennington
36 changed files
--- 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

--- a/bourbon/_bourbon.scss
+++ b/bourbon/_bourbon.scss
--- a/bourbon/addons/_button.scss
+++ b/bourbon/addons/_button.scss
--- a/bourbon/addons/_clearfix.scss
+++ b/bourbon/addons/_clearfix.scss
--- a/bourbon/addons/_font-family.scss
+++ b/bourbon/addons/_font-family.scss
--- a/bourbon/addons/_html5-input-types.scss
+++ b/bourbon/addons/_html5-input-types.scss
--- a/bourbon/addons/_position.scss
+++ b/bourbon/addons/_position.scss
--- a/bourbon/addons/_timing-functions.scss
+++ b/bourbon/addons/_timing-functions.scss
--- a/bourbon/css3/_animation.scss
+++ b/bourbon/css3/_animation.scss
--- a/bourbon/css3/_appearance.scss
+++ b/bourbon/css3/_appearance.scss
--- a/bourbon/css3/_background-image.scss
+++ b/bourbon/css3/_background-image.scss
--- a/bourbon/css3/_background-size.scss
+++ b/bourbon/css3/_background-size.scss
--- a/bourbon/css3/_border-image.scss
+++ b/bourbon/css3/_border-image.scss
--- a/bourbon/css3/_border-radius.scss
+++ b/bourbon/css3/_border-radius.scss
--- a/bourbon/css3/_box-shadow.scss
+++ b/bourbon/css3/_box-shadow.scss
--- a/bourbon/css3/_box-sizing.scss
+++ b/bourbon/css3/_box-sizing.scss
--- a/bourbon/css3/_columns.scss
+++ b/bourbon/css3/_columns.scss
--- a/bourbon/css3/_flex-box.scss
+++ b/bourbon/css3/_flex-box.scss
--- a/bourbon/css3/_inline-block.scss
+++ b/bourbon/css3/_inline-block.scss
--- a/bourbon/css3/_linear-gradient.scss
+++ b/bourbon/css3/_linear-gradient.scss
--- a/bourbon/css3/_radial-gradient.scss
+++ b/bourbon/css3/_radial-gradient.scss
--- a/bourbon/css3/_transform.scss
+++ b/bourbon/css3/_transform.scss
--- a/bourbon/css3/_transition.scss
+++ b/bourbon/css3/_transition.scss
--- a/bourbon/css3/_user-select.scss
+++ b/bourbon/css3/_user-select.scss
--- a/bourbon/functions/_deprecated-webkit-gradient.scss
+++ b/bourbon/functions/_deprecated-webkit-gradient.scss
--- a/bourbon/functions/_flex-grid.scss
+++ b/bourbon/functions/_flex-grid.scss
--- a/bourbon/functions/_grid-width.scss
+++ b/bourbon/functions/_grid-width.scss
--- a/bourbon/functions/_linear-gradient.scss
+++ b/bourbon/functions/_linear-gradient.scss
--- a/bourbon/functions/_modular-scale.scss
+++ b/bourbon/functions/_modular-scale.scss
--- a/bourbon/functions/_radial-gradient.scss
+++ b/bourbon/functions/_radial-gradient.scss
--- a/bourbon/functions/_render-gradients.scss
+++ b/bourbon/functions/_render-gradients.scss
--- a/bourbon/functions/_tint-shade.scss
+++ b/bourbon/functions/_tint-shade.scss
--- a/bourbon/lib/bourbon.rb
+++ b/bourbon/lib/bourbon.rb
--- a/bourbon/lib/bourbon/sass_extensions.rb
+++ b/bourbon/lib/bourbon/sass_extensions.rb
--- a/bourbon/lib/bourbon/sass_extensions/functions.rb
+++ b/bourbon/lib/bourbon/sass_extensions/functions.rb
--- a/bourbon/lib/bourbon/sass_extensions/functions/compact.rb
+++ b/bourbon/lib/bourbon/sass_extensions/functions/compact.rb