merge #975 into dev
This commit is contained in:
commit
a34fa75995
2 changed files with 5 additions and 4 deletions
|
@ -38,7 +38,7 @@ module.exports = function(grunt) {
|
|||
},
|
||||
|
||||
sass: {
|
||||
main: {
|
||||
dist: {
|
||||
files: {
|
||||
'css/theme/default.css': 'css/theme/source/default.scss',
|
||||
'css/theme/black.css': 'css/theme/source/black.scss',
|
||||
|
@ -126,7 +126,7 @@ module.exports = function(grunt) {
|
|||
grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
|
||||
grunt.loadNpmTasks( 'grunt-contrib-uglify' );
|
||||
grunt.loadNpmTasks( 'grunt-contrib-watch' );
|
||||
grunt.loadNpmTasks( 'grunt-contrib-sass' );
|
||||
grunt.loadNpmTasks( 'grunt-sass' );
|
||||
grunt.loadNpmTasks( 'grunt-contrib-connect' );
|
||||
grunt.loadNpmTasks( 'grunt-zip' );
|
||||
|
||||
|
|
|
@ -32,10 +32,11 @@
|
|||
"grunt-contrib-cssmin": "~0.4.1",
|
||||
"grunt-contrib-uglify": "~0.2.4",
|
||||
"grunt-contrib-watch": "~0.5.3",
|
||||
"grunt-contrib-sass": "~0.5.0",
|
||||
"grunt-sass": "~0.14.0",
|
||||
"grunt-contrib-connect": "~0.5.0",
|
||||
"grunt-zip": "~0.7.0",
|
||||
"grunt": "~0.4.0"
|
||||
"grunt": "~0.4.0",
|
||||
"node-sass": "~0.9.3"
|
||||
},
|
||||
"licenses": [
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue