Combine & minify css and change the dist structure

Author: farhan687

GruntFile.js

@@ -1,8 +1,8 @@
-
 module.exports = function(grunt) {
 	var srcPath = ["scripts/**/*.js"];
+	var stylePath = ["styles/main.css", "styles/docs.css"];
 	var testePath = "spec/*Spec.js";
-	var libPaths = ['polyfills/polyfill.js','bower_components/jquery/dist/jquery.min.js', 'bower_components/flatdoc/legacy.js' ,'bower_components/flatdoc/flatdoc.js', 'scripts/flatdoc-theme.js', 'bower_components/angular/angular.js', 'bower_components/angular-route/angular-route.js', 'bower_components/js-schema/js-schema.min.js', 'bower_components/google-code-prettify/bin/prettify.min.js', 'bower_components/bootstrap/dist/js/bootstrap.min.js'];
+	var libPaths = ['polyfills/polyfill.js', 'bower_components/jquery/dist/jquery.min.js', 'bower_components/flatdoc/legacy.js', 'bower_components/flatdoc/flatdoc.js', 'scripts/flatdoc-theme.js', 'bower_components/angular/angular.js', 'bower_components/angular-route/angular-route.js', 'bower_components/js-schema/js-schema.min.js', 'bower_components/google-code-prettify/bin/prettify.min.js', 'bower_components/bootstrap/dist/js/bootstrap.min.js'];
 	grunt.initConfig({
 		concat: {
 			default: {
@@ -12,7 +12,7 @@ module.exports = function(grunt) {
 					}
 				},
 				src: srcPath,
-				dest: 'dist/main.js',
+				dest: 'dist/js/main.js',
 			}
 		},
 		jshint: {
@@ -28,59 +28,70 @@ module.exports = function(grunt) {
 			},
 			dist: {
 				files: {
-					'dist/main.min.js': [srcPath]
+					'dist/js/main.min.js': [srcPath]
 				}
 			},
 			unicfile: {
-					files: {
-						'dist/main.unique.js': libPaths.concat([srcPath])
-					}
+				files: {
+					'dist/js/main.unique.js': libPaths.concat([srcPath])
 				}
-			},
+			}
+		},
+		cssmin: {
+			dev: {
+				options: {
+					report: "min"
+				},
+				src: stylePath,
+				dest: "dist/css/main.min.css",
+			}
+		},
 		jasmine: {
-	     pivotal: {
-	       src: [srcPath],
-	       options: {
-	         specs: testePath,
-	         helpers: 'spec/*Helper.js',
-					vendor : libPaths,/*
-					 template: require('grunt-template-jasmine-istanbul'),
-					 templateOptions: {
-							 coverage: 'bin/coverage/coverage.json',
-							 report: 'bin/coverage',
-							 thresholds: {// we will use this soon
-									 lines: 100,
-									 statements: 100,
-									 branches: 100,
-									 functions: 100
-							 }
-					 }*/
-	       }
-	     }
-	  },
+			pivotal: {
+				src: [srcPath],
+				options: {
+					specs: testePath,
+					helpers: 'spec/*Helper.js',
+					vendor: libPaths,
+					/*
+										 template: require('grunt-template-jasmine-istanbul'),
+										 templateOptions: {
+												 coverage: 'bin/coverage/coverage.json',
+												 report: 'bin/coverage',
+												 thresholds: {// we will use this soon
+														 lines: 100,
+														 statements: 100,
+														 branches: 100,
+														 functions: 100
+												 }
+										 }*/
+				}
+			}
+		},
 		watch: {
 			scripts: {
 				files: [srcPath, testePath],
-				tasks: ['jshint', 'uglify', 'concat','jasmine' ],
+				tasks: ['jshint', 'uglify', 'concat', 'jasmine'],
 				options: {
 					spawn: false,
 				},
 			},
 		},
 		bump: {
-		    options: {
-		        files: ['bower.json'],
-		        commitFiles: ["-a"],
-		        push: false
-		    }
+			options: {
+				files: ['bower.json'],
+				commitFiles: ["-a"],
+				push: false
+			}
 		}
 	});
 
 	grunt.loadNpmTasks('grunt-contrib-jshint');
-grunt.loadNpmTasks('grunt-bump');
+	grunt.loadNpmTasks('grunt-bump');
 	grunt.loadNpmTasks('grunt-contrib-uglify');
+	grunt.loadNpmTasks('grunt-contrib-cssmin');
 	grunt.loadNpmTasks('grunt-contrib-concat');
 	grunt.loadNpmTasks('grunt-contrib-watch');
 	grunt.loadNpmTasks('grunt-contrib-jasmine');
-	grunt.registerTask('default', ['jshint', 'jasmine', 'concat:default', 'uglify']);
-};
+	grunt.registerTask('default', ['jshint', 'jasmine', 'concat:default', 'uglify', 'cssmin']);
+};

dist/css/main.min.css

@@ -19,6 +19,7 @@
     "grunt-bump": "^0.7.0",
     "grunt-contrib-concat": "^0.5.1",
     "grunt-contrib-connect": "^0.10.1",
+    "grunt-contrib-cssmin": "^1.0.0",
     "grunt-contrib-jasmine": "^0.9.2",
     "grunt-contrib-jshint": "^0.11.2",
     "grunt-contrib-uglify": "^0.9.1",

dist/main.js dist/js/main.jsdist/main.js renamed to dist/js/main.js

@@ -1,5 +1,3 @@
- @import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,600,700);
-
 .navbar-brand img{
   display: block;
   margin-top: -7px;

dist/main.min.js dist/js/main.min.jsdist/main.min.js renamed to dist/js/main.min.js

@@ -1,3 +1,5 @@
+ @import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,600,700);
+ 
 /**
 *
 * DocBase styling