diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-02-14 01:37:48 +0400 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-02-14 01:37:48 +0400 |
commit | 57bbed7e6f8043ca05c3df36f0d41cc3211876b8 (patch) | |
tree | 73cd5fe9da744440fc8b0ac9b615c37145f3d8e5 /templates | |
parent | 19b5c852f2d517011152c38506060fd5cfb4eda4 (diff) |
fix compass issue (does not recognize .scss.erb as scss): change compass template to Sass
Diffstat (limited to 'templates')
-rw-r--r-- | templates/project/_variables.sass.erb | 6 | ||||
-rw-r--r-- | templates/project/_variables.scss.erb | 6 | ||||
-rw-r--r-- | templates/project/manifest.rb | 4 | ||||
-rw-r--r-- | templates/project/styles.sass | 3 | ||||
-rw-r--r-- | templates/project/styles.scss | 3 |
5 files changed, 11 insertions, 11 deletions
diff --git a/templates/project/_variables.sass.erb b/templates/project/_variables.sass.erb new file mode 100644 index 0000000..67a57e0 --- /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 ad12f30..0000000 --- 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 730694c..77243d7 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 0000000..1920a0d --- /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 27bd0bb..0000000 --- a/templates/project/styles.scss +++ /dev/null @@ -1,3 +0,0 @@ -// customize bootstrap variables here: -@import "variables"; -@import "bootstrap"; |