From ac091c4f96ad8e2f13bc51a2074b7d8c1d7c2822 Mon Sep 17 00:00:00 2001 From: Saurabh Kumar Date: Fri, 10 Jan 2014 13:39:46 +0530 Subject: [PATCH] fix(grunt): Use 'sass' as folder name instead of 'scss'. * Sass is the actual name of the language, not scss[1]. [1] http://sass-lang.com/ --- {{cookiecutter.repo_name}}/Gruntfile.js | 8 ++++---- .../static/css/project.css | 10 +++++----- .../static/{scss => sass}/project.scss | 0 3 files changed, 9 insertions(+), 9 deletions(-) rename {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/static/{scss => sass}/project.scss (100%) diff --git a/{{cookiecutter.repo_name}}/Gruntfile.js b/{{cookiecutter.repo_name}}/Gruntfile.js index 66c3b40e..2b9f32f1 100644 --- a/{{cookiecutter.repo_name}}/Gruntfile.js +++ b/{{cookiecutter.repo_name}}/Gruntfile.js @@ -17,7 +17,7 @@ module.exports = function (grunt) { app: this.app, templates: this.app + '/templates', css: this.app + '/static/css', - scss: this.app + '/static/scss', + sass: this.app + '/static/sass', fonts: this.app + '/static/fonts', images: this.app + '/static/images', js: this.app + '/static/js', @@ -36,13 +36,13 @@ module.exports = function (grunt) { files: ['Gruntfile.js'] }, compass: { - files: ['<%= paths.scss %>/**/*.{scss,sass}'], + files: ['<%= paths.sass %>/**/*.{scss,sass}'], tasks: ['compass:server'] }, livereload: { files: [ '<%= paths.js %>/**/*.js', - '<%= paths.scss %>/**/*.{scss,sass}', + '<%= paths.sass %>/**/*.{scss,sass}', '<%= paths.app %>/**/*.html' ], options: { @@ -55,7 +55,7 @@ module.exports = function (grunt) { // see: https://github.com/gruntjs/grunt-contrib-compass compass: { options: { - sassDir: '<%= paths.scss %>', + sassDir: '<%= paths.sass %>', cssDir: '<%= paths.css %>', fontsDir: '<%= paths.fonts %>', imagesDir: '<%= paths.images %>', diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/static/css/project.css b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/static/css/project.css index f4873dd6..4162d5de 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/static/css/project.css +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/static/css/project.css @@ -1,32 +1,32 @@ -/* line 5, ../scss/project.scss */ +/* line 5, ../sass/project.scss */ .alert-debug { color: black; background-color: white; border-color: #d6e9c6; } -/* line 11, ../scss/project.scss */ +/* line 11, ../sass/project.scss */ .alert-info { color: #3a87ad; background-color: #d9edf7; border-color: #bce8f1; } -/* line 17, ../scss/project.scss */ +/* line 17, ../sass/project.scss */ .alert-success { color: #468847; background-color: #dff0d8; border-color: #d6e9c6; } -/* line 23, ../scss/project.scss */ +/* line 23, ../sass/project.scss */ .alert-warning { color: black; background-color: orange; border-color: #d6e9c6; } -/* line 29, ../scss/project.scss */ +/* line 29, ../sass/project.scss */ .alert-error { color: #b94a48; background-color: #f2dede; diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/static/scss/project.scss b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/static/sass/project.scss similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/static/scss/project.scss rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/static/sass/project.scss