mirror of
				https://github.com/twbs/bootstrap.git
				synced 2025-10-31 00:04:27 -04:00 
			
		
		
		
	Merge pull request #13624 from robertdodd/master
Reassigned minification of CSS files to the cssmin task.
This commit is contained in:
		
						commit
						3dd1531d81
					
				
							
								
								
									
										17
									
								
								Gruntfile.js
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								Gruntfile.js
									
									
									
									
									
								
							| @ -175,15 +175,6 @@ module.exports = function (grunt) { | ||||
|         files: { | ||||
|           'dist/css/<%= pkg.name %>-theme.css': 'less/theme.less' | ||||
|         } | ||||
|       }, | ||||
|       minify: { | ||||
|         options: { | ||||
|           cleancss: true | ||||
|         }, | ||||
|         files: { | ||||
|           'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css', | ||||
|           'dist/css/<%= pkg.name %>-theme.min.css': 'dist/css/<%= pkg.name %>-theme.css' | ||||
|         } | ||||
|       } | ||||
|     }, | ||||
| 
 | ||||
| @ -239,6 +230,12 @@ module.exports = function (grunt) { | ||||
|         compatibility: 'ie8', | ||||
|         keepSpecialComments: '*' | ||||
|       }, | ||||
|       core: { | ||||
|         files: { | ||||
|           'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css', | ||||
|           'dist/css/<%= pkg.name %>-theme.min.css': 'dist/css/<%= pkg.name %>-theme.css', | ||||
|         } | ||||
|       }, | ||||
|       docs: { | ||||
|         src: [ | ||||
|           'docs/assets/css/_src/docs.css', | ||||
| @ -436,7 +433,7 @@ module.exports = function (grunt) { | ||||
| 
 | ||||
|   // CSS distribution task.
 | ||||
|   grunt.registerTask('less-compile', ['less:compileCore', 'less:compileTheme']); | ||||
|   grunt.registerTask('dist-css', ['less-compile', 'autoprefixer', 'usebanner', 'csscomb', 'less:minify', 'cssmin']); | ||||
|   grunt.registerTask('dist-css', ['less-compile', 'autoprefixer', 'usebanner', 'csscomb', 'cssmin']); | ||||
| 
 | ||||
|   // Docs distribution task.
 | ||||
|   grunt.registerTask('dist-docs', 'copy:docs'); | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user