mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2024-11-26 03:24:01 +03:00
Merge pull request #60 from theskumar/patch-2
fix(grunt): Use 'sass' as folder name instead of 'scss'.
This commit is contained in:
commit
9143f6ca37
|
@ -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 %>',
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user