windhamdavid 10 years ago
parent
commit
3dbcdb7c35
2 changed files with 2 additions and 2 deletions
  1. 2 2
      gruntfile.js
  2. 0 0
      js/script.min.js

+ 2 - 2
gruntfile.js

@@ -13,7 +13,7 @@ module.exports = function(grunt) {
 		cssmin: {
 		  combine: {
 		    files: {
-		      'css/style.min.css': ['css/styles.css', 'css/bootstrap.css', 'css/font-awesome.css' ]
+		      'css/style.min.css': ['style.css', 'css/bootstrap.css', 'css/font-awesome.css', 'css/fullcalendar.css', 'css/animate.css']
 		    }
 		  }
 		},
@@ -23,7 +23,7 @@ module.exports = function(grunt) {
 				separator: ';',
 			},
 			dist: {
-				src: ['js/scripts.js', 'js/bootstrap.min.js', 'js/jasny-canvas.js'],
+				src: ['js/jquery-2.1.1.min.js', 'js/bootstrap.min.js', 'js/jasny-canvas.js', 'js/scripts.js', 'js/moment.min.js', 'js/fullcalendar.min.js'],
 				dest: 'js/script.js',
 			},
 		},

File diff suppressed because it is too large
+ 0 - 0
js/script.min.js


Some files were not shown because too many files changed in this diff