From 57bbed7e6f8043ca05c3df36f0d41cc3211876b8 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Thu, 13 Feb 2014 22:37:48 +0100
Subject: [PATCH] fix compass issue (does not recognize .scss.erb as scss):
 change compass template to Sass

---
 templates/project/_variables.sass.erb | 6 ++++++
 templates/project/_variables.scss.erb | 6 ------
 templates/project/manifest.rb         | 4 ++--
 templates/project/styles.sass         | 3 +++
 templates/project/styles.scss         | 3 ---
 5 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 templates/project/_variables.sass.erb
 delete mode 100644 templates/project/_variables.scss.erb
 create mode 100644 templates/project/styles.sass
 delete mode 100644 templates/project/styles.scss

diff --git a/templates/project/_variables.sass.erb b/templates/project/_variables.sass.erb
new file mode 100644
index 0000000000..67a57e0d0b
--- /dev/null
+++ 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
deleted file mode 100644
index ad12f30b3f..0000000000
--- a/templates/project/_variables.scss.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<% require 'bootstrap-sass/version' %>
-
-@import "bootstrap/variables";
-
-// Override Bootstrap variables here (defaults copied from bootstrap-sass version <%= Bootstrap::VERSION %>):
-<%= File.read(@template[:options][:bs_variables_path]).gsub(/^(?=\$)/, '//').gsub(/ !default/, '') %>
diff --git a/templates/project/manifest.rb b/templates/project/manifest.rb
index 730694c4c8..77243d7be5 100644
--- 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
new file mode 100644
index 0000000000..1920a0d1fc
--- /dev/null
+++ 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
deleted file mode 100644
index 27bd0bb477..0000000000
--- a/templates/project/styles.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// customize bootstrap variables here:
-@import "variables";
-@import "bootstrap";