Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-rubygem.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Mazovetskiy <glex.spb@gmail.com>2015-08-27 15:37:44 +0300
committerGleb Mazovetskiy <glex.spb@gmail.com>2015-08-27 15:37:44 +0300
commit9f416cc8d801d18105cae60fb0d515729fa38e2d (patch)
treeffb9a42196af76adefa46bee6cd31794a3c54597
parent82ceb6b740d6ef5ca7d809520114cae6246863b4 (diff)
Compass template .sass -> .scss
-rw-r--r--tasks/updater/scss.rb2
-rw-r--r--templates/project/_bootstrap-variables.scss (renamed from templates/project/_bootstrap-variables.sass)0
-rw-r--r--templates/project/manifest.rb2
-rw-r--r--templates/project/styles.scss (renamed from templates/project/styles.sass)10
4 files changed, 7 insertions, 7 deletions
diff --git a/tasks/updater/scss.rb b/tasks/updater/scss.rb
index 0c2bba9..527ba03 100644
--- a/tasks/updater/scss.rb
+++ b/tasks/updater/scss.rb
@@ -25,7 +25,7 @@ class Updater
end
log_status 'Generating variable template file'
- save_file 'templates/project/_bootstrap-variables.sass',
+ save_file 'templates/project/_bootstrap-variables.scss',
"// Override Bootstrap variables here (defaults from bootstrap v#{upstream_version}):\n\n" +
File.read("#{save_to}/_variables.scss").lines[1..-1].join.gsub(/^(?=\$|\)|[ ]{2})/, '// ').gsub(/ !default/, '')
diff --git a/templates/project/_bootstrap-variables.sass b/templates/project/_bootstrap-variables.scss
index 7b06903..7b06903 100644
--- a/templates/project/_bootstrap-variables.sass
+++ b/templates/project/_bootstrap-variables.scss
diff --git a/templates/project/manifest.rb b/templates/project/manifest.rb
index bbf33cf..c702072 100644
--- a/templates/project/manifest.rb
+++ b/templates/project/manifest.rb
@@ -4,7 +4,7 @@ description 'Bootstrap'
stylesheet 'styles.sass'
# Bootstrap variable overrides file
-stylesheet '_bootstrap-variables.sass', :to => '_bootstrap-variables.sass'
+stylesheet '_bootstrap-variables.scss', :to => '_bootstrap-variables.scss'
# Copy JS
manifest = Pathname.new(File.dirname(__FILE__))
diff --git a/templates/project/styles.sass b/templates/project/styles.scss
index f59fbe1..2348f4f 100644
--- a/templates/project/styles.sass
+++ b/templates/project/styles.scss
@@ -1,10 +1,10 @@
// Import custom Bootstrap variables
-@import "bootstrap-variables"
+@import "bootstrap-variables";
// Import Bootstrap
-@import "bootstrap"
+@import "bootstrap";
// or Import Bootstrap Flex
-//@import "bootstrap-flex"
+// @import "bootstrap-flex";
// or Import Bootstrap Grid
-//@import "bootstrap-grid"
+// @import "bootstrap-grid";
// or Import Bootstrap Reboot
-//@import "bootstrap-reboot"
+// @import "bootstrap-reboot";