kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

Undo merge of #11778 and use cleancss min option

Browse source
This commit is contained in:
Mark Otto 2013-12-09 00:12:11 -08:00
parent b9b17bc72b
commit d466d527a4
4 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Gruntfile.js
View file

@ -117,6 +117,16 @@ module.exports = function (grunt) {
'dist/css/<%= pkg.name %>-theme.css': 'less/theme.less' 'dist/css/<%= pkg.name %>-theme.css': 'less/theme.less'
} }
}, },
minify: {
options: {
cleancss: true,
report: 'min'
},
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'
}
}
}, },
usebanner: { usebanner: {
@ -128,26 +138,14 @@ module.exports = function (grunt) {
files: { files: {
src: [ src: [
'dist/css/<%= pkg.name %>.css', 'dist/css/<%= pkg.name %>.css',
'dist/css/<%= pkg.name %>.min.css',
'dist/css/<%= pkg.name %>-theme.css', 'dist/css/<%= pkg.name %>-theme.css',
'dist/css/<%= pkg.name %>-theme.min.css',
] ]
} }
} }
}, },
cssmin: {
compress: {
options: {
keepSpecialComments: 1,
report: 'min',
selectorsMergeMode: 'ie8'
},
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'
}
}
},
csscomb: { csscomb: {
sort: { sort: {
options: { options: {
@ -330,7 +328,6 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-connect'); grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-csslint'); grunt.loadNpmTasks('grunt-contrib-csslint');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-less'); grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-contrib-qunit'); grunt.loadNpmTasks('grunt-contrib-qunit');
@ -359,7 +356,7 @@ module.exports = function (grunt) {
grunt.registerTask('dist-js', ['concat', 'uglify']); grunt.registerTask('dist-js', ['concat', 'uglify']);
// CSS distribution task. // CSS distribution task.
grunt.registerTask('dist-css', ['less', 'cssmin', 'csscomb', 'usebanner']); grunt.registerTask('dist-css', ['less', 'csscomb', 'usebanner']);
// Fonts distribution task. // Fonts distribution task.
grunt.registerTask('dist-fonts', ['copy']); grunt.registerTask('dist-fonts', ['copy']);

9
dist/css/bootstrap-theme.min.css vendored
View file

File diff suppressed because one or more lines are too long

9
dist/css/bootstrap.min.css vendored
View file

File diff suppressed because one or more lines are too long

1
package.json
View file

@ -28,7 +28,6 @@
, "grunt-contrib-connect": "~0.5.0" , "grunt-contrib-connect": "~0.5.0"
, "grunt-contrib-copy": "~0.4.1" , "grunt-contrib-copy": "~0.4.1"
, "grunt-contrib-csslint": "~0.2.0" , "grunt-contrib-csslint": "~0.2.0"
, "grunt-contrib-cssmin": "~0.7.0"
, "grunt-contrib-jshint": "~0.7.0" , "grunt-contrib-jshint": "~0.7.0"
, "grunt-contrib-less": "~0.8.0" , "grunt-contrib-less": "~0.8.0"
, "grunt-contrib-qunit": "~0.3.0" , "grunt-contrib-qunit": "~0.3.0"