reveal.css is now scss, merge autoprexier #1007
This commit is contained in:
		
						commit
						cc02564b2f
					
				
					 4 changed files with 2228 additions and 1428 deletions
				
			
		
							
								
								
									
										33
									
								
								Gruntfile.js
									
										
									
									
									
								
							
							
						
						
									
										33
									
								
								Gruntfile.js
									
										
									
									
									
								
							|  | @ -29,17 +29,10 @@ module.exports = function(grunt) { | |||
| 			} | ||||
| 		}, | ||||
| 
 | ||||
| 		cssmin: { | ||||
| 			compress: { | ||||
| 				files: { | ||||
| 					'css/reveal.min.css': [ 'css/reveal.css' ] | ||||
| 				} | ||||
| 			} | ||||
| 		}, | ||||
| 
 | ||||
| 		sass: { | ||||
| 			dist: { | ||||
| 				files: { | ||||
| 					'css/reveal.css': 'css/reveal.scss', | ||||
| 					'css/theme/default.css': 'css/theme/source/default.scss', | ||||
| 					'css/theme/black.css': 'css/theme/source/black.scss', | ||||
| 					'css/theme/beige.css': 'css/theme/source/beige.scss', | ||||
|  | @ -54,6 +47,20 @@ module.exports = function(grunt) { | |||
| 			} | ||||
| 		}, | ||||
| 
 | ||||
| 		autoprefixer: { | ||||
| 			dist: { | ||||
| 				src: 'css/reveal.css' | ||||
| 			} | ||||
| 		}, | ||||
| 
 | ||||
| 		cssmin: { | ||||
| 			compress: { | ||||
| 				files: { | ||||
| 					'css/reveal.min.css': [ 'css/reveal.css' ] | ||||
| 				} | ||||
| 			} | ||||
| 		}, | ||||
| 
 | ||||
| 		jshint: { | ||||
| 			options: { | ||||
| 				curly: false, | ||||
|  | @ -113,6 +120,10 @@ module.exports = function(grunt) { | |||
| 				files: [ 'css/theme/source/*.scss', 'css/theme/template/*.scss' ], | ||||
| 				tasks: 'themes' | ||||
| 			}, | ||||
| 			css: { | ||||
| 				files: [ 'css/reveal.css' ], | ||||
| 				tasks: 'css' | ||||
| 			}, | ||||
|             html: { | ||||
|                 files: [ 'index.html'] | ||||
|             } | ||||
|  | @ -128,14 +139,18 @@ module.exports = function(grunt) { | |||
| 	grunt.loadNpmTasks( 'grunt-contrib-watch' ); | ||||
| 	grunt.loadNpmTasks( 'grunt-sass' ); | ||||
| 	grunt.loadNpmTasks( 'grunt-contrib-connect' ); | ||||
| 	grunt.loadNpmTasks( 'grunt-autoprefixer' ); | ||||
| 	grunt.loadNpmTasks( 'grunt-zip' ); | ||||
| 
 | ||||
| 	// Default task
 | ||||
| 	grunt.registerTask( 'default', [ 'jshint', 'cssmin', 'uglify', 'qunit' ] ); | ||||
| 	grunt.registerTask( 'default', [ 'jshint', 'css', 'uglify', 'qunit' ] ); | ||||
| 
 | ||||
| 	// Theme task
 | ||||
| 	grunt.registerTask( 'themes', [ 'sass' ] ); | ||||
| 
 | ||||
| 	// CSS task
 | ||||
| 	grunt.registerTask( 'css', [ 'sass', 'autoprefixer', 'cssmin' ] ); | ||||
| 
 | ||||
| 	// Package presentation to archive
 | ||||
| 	grunt.registerTask( 'package', [ 'default', 'zip' ] ); | ||||
| 
 | ||||
|  |  | |||
							
								
								
									
										2273
									
								
								css/reveal.css
									
										
									
									
									
								
							
							
						
						
									
										2273
									
								
								css/reveal.css
									
										
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
							
								
								
									
										1349
									
								
								css/reveal.scss
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1349
									
								
								css/reveal.scss
									
										
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							|  | @ -34,6 +34,7 @@ | |||
|     "grunt-contrib-watch": "~0.5.3", | ||||
|     "grunt-sass": "~0.14.0", | ||||
|     "grunt-contrib-connect": "~0.5.0", | ||||
|     "grunt-autoprefixer": "~1.0.1", | ||||
|     "grunt-zip": "~0.7.0", | ||||
|     "grunt": "~0.4.0", | ||||
|     "node-sass": "~0.9.3" | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue