mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets

Browse Source 
Conflicts:
	package.json
This commit is contained in:
Mark Otto
2014-01-11 14:48:04 -08:00
parent 7a2c352b50 d06d61dc12
commit e68d3b961e
9 changed files with 65 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gruntfile.js
+39 -9
View File
@@ -26,7 +26,13 @@ module.exports = function (grunt) {
' * Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
' * Licensed under <%= _.pluck(pkg.licenses, "type") %> (<%= _.pluck(pkg.licenses, "url") %>)\n' +
' */\n',
jqueryCheck: 'if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }\n\n',
bannerDocs: '/*!\n' +
' * Bootstrap Docs (<%= pkg.homepage %>)\n' +
' * Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
' * Licensed under the Creative Commons Attribution 3.0 Unported License. For\n' +
' * details, see http://creativecommons.org/licenses/by/3.0/.\n' +
' */\n',
jqueryCheck: 'if (typeof jQuery === \'undefined\') { throw new Error(\'Bootstrap requires jQuery\') }\n\n',
// Task configuration.
clean: {
@@ -113,7 +119,7 @@ module.exports = function (grunt) {
uglify: {
bootstrap: {
options: {
banner: '<%= banner %>\n',
banner: '<%= banner %>',
report: 'min'
},
src: ['<%= concat.bootstrap.dest %>'],
@@ -121,12 +127,7 @@ module.exports = function (grunt) {
},
customize: {
options: {
banner: '/*!\n' +
' * Bootstrap Docs (<%= pkg.homepage %>)\n' +
' * Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
' * Licensed under the Creative Commons Attribution 3.0 Unported License. For\n' +
' * details, see http://creativecommons.org/licenses/by/3.0/.\n' +
' */\n',
banner: '<%= bannerDocs %>',
report: 'min'
},
src: [
@@ -134,9 +135,21 @@ module.exports = function (grunt) {
'docs/assets/js/jszip.js',
'docs/assets/js/uglify.js',
'docs/assets/js/filesaver.js',
'docs/assets/js/raw-files.js',
'docs/assets/js/customizer.js'
],
dest: 'docs/assets/js/customize.min.js'
},
docsJs: {
options: {
banner: '<%= bannerDocs %>',
report: 'min'
},
src: [
'docs/assets/js/holder.js',
'docs/assets/js/application.js'
],
dest: 'docs/assets/js/docs.min.js'
}
},
@@ -177,6 +190,23 @@ module.exports = function (grunt) {
}
},
cssmin: {
compress: {
options: {
banner: '<%= bannerDocs %>',
keepSpecialComments: '*',
noAdvanced: true, // turn advanced optimizations off until it's fixed in clean-css
report: 'min',
selectorsMergeMode: 'ie8'
},
src: [
'docs/assets/css/docs.css',
'docs/assets/css/pygments-manni.css'
],
dest: 'docs/assets/css/pack.min.css'
}
},
usebanner: {
dist: {
options: {
@@ -345,7 +375,7 @@ module.exports = function (grunt) {
grunt.registerTask('dist-js', ['concat', 'uglify']);
// CSS distribution task.
grunt.registerTask('dist-css', ['less', 'csscomb', 'usebanner']);
grunt.registerTask('dist-css', ['less', 'cssmin', 'csscomb', 'usebanner']);
// Docs distribution task.
grunt.registerTask('dist-docs', ['copy:docs']);