fix compass issue (does not recognize .scss.erb as scss): change comp…

…ass template to Sass
bipicar · Feb 13, 2014 · 57bbed7 · 57bbed7
1 parent 19b5c85
commit 57bbed7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/templates/project/_variables.sass.erb b/templates/project/_variables.sass.erb
@@ -0,0 +1,6 @@
+@import "bootstrap/variables"
+
+<% require 'bootstrap-sass/version' %>
+// Override Bootstrap variables here (defaults from bootstrap-sass v<%= Bootstrap::VERSION %>):
+
+<%= File.read(@template[:options][:bs_variables_path]).gsub(/^(?=\$)/, '// ').gsub(/ !default;/, '') %>
diff --git a/templates/project/_variables.scss.erb b/templates/project/_variables.scss.erb
diff --git a/templates/project/manifest.rb b/templates/project/manifest.rb
@@ -1,14 +1,14 @@
 description 'Bootstrap for Sass'
 
 # Stylesheet importing bootstrap
-stylesheet 'styles.scss'
+stylesheet 'styles.sass'
 
 # SCSS:
 
 assets = "../../vendor/assets"
 
 bs_stylesheets = "#{assets}/stylesheets/bootstrap"
-stylesheet '_variables.scss.erb', :to => '_variables.scss', :erb => true,
+stylesheet '_variables.sass.erb', :to => '_variables.sass', :erb => true,
            :bs_variables_path => File.expand_path("#{bs_stylesheets}/_variables.scss", File.dirname(__FILE__))
 
 # JS:

diff --git a/templates/project/styles.sass b/templates/project/styles.sass
@@ -0,0 +1,3 @@
+// customize bootstrap variables here:
+@import "variables"
+@import "bootstrap"
diff --git a/templates/project/styles.scss b/templates/project/styles.scss