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

Merge pull request #13012 from twbs/banner

This commit is contained in:
XhmikosR
2014-03-11 19:50:09 +02:00
8 changed files with 25 additions and 47 deletions
+18 -28
View File
@@ -245,13 +245,13 @@ module.exports = function (grunt) {
}, },
cssmin: { cssmin: {
compress: { options: {
options: { keepSpecialComments: '*',
keepSpecialComments: '*', noAdvanced: true, // turn advanced optimizations off until the issue is fixed in clean-css
noAdvanced: true, // turn advanced optimizations off until the issue is fixed in clean-css report: 'min',
report: 'min', compatibility: 'ie8'
compatibility: 'ie8' },
}, docs: {
src: [ src: [
'docs/assets/css/src/docs.css', 'docs/assets/css/src/docs.css',
'docs/assets/css/src/pygments-manni.css' 'docs/assets/css/src/pygments-manni.css'
@@ -261,21 +261,12 @@ module.exports = function (grunt) {
}, },
usebanner: { usebanner: {
dist: { options: {
options: { position: 'top',
position: 'top', banner: '<%= banner %>'
banner: '<%= banner %>' },
}, files: {
files: { src: 'dist/css/*.css'
src: [
'dist/css/<%= pkg.name %>.css',
'dist/css/<%= pkg.name %>-rtl.css',
'dist/css/<%= pkg.name %>.min.css',
'dist/css/<%= pkg.name %>-rtl.min.css',
'dist/css/<%= pkg.name %>-theme.css',
'dist/css/<%= pkg.name %>-theme.min.css'
]
}
} }
}, },
@@ -284,11 +275,10 @@ module.exports = function (grunt) {
config: 'less/.csscomb.json' config: 'less/.csscomb.json'
}, },
dist: { dist: {
files: { expand: true,
'dist/css/<%= pkg.name %>.css': 'dist/css/<%= pkg.name %>.css', cwd: 'dist/css/',
'dist/css/<%= pkg.name %>-rtl.css': 'dist/css/<%= pkg.name %>-rtl.css', src: ['*.css', '!*.min.css'],
'dist/css/<%= pkg.name %>-theme.css': 'dist/css/<%= pkg.name %>-theme.css' dest: 'dist/css/'
}
}, },
examples: { examples: {
expand: true, expand: true,
@@ -447,7 +437,7 @@ module.exports = function (grunt) {
// CSS distribution task. // CSS distribution task.
grunt.registerTask('less-compile', ['less:compileCore', 'less:compileTheme']); grunt.registerTask('less-compile', ['less:compileCore', 'less:compileTheme']);
grunt.registerTask('dist-css', ['less-compile', 'autoprefixer', 'css_flip', 'csscomb', 'less:minify', 'cssmin', 'usebanner']); grunt.registerTask('dist-css', ['less-compile', 'autoprefixer', 'css_flip', 'usebanner', 'csscomb', 'less:minify', 'cssmin']);
// Docs distribution task. // Docs distribution task.
grunt.registerTask('dist-docs', 'copy:docs'); grunt.registerTask('dist-docs', 'copy:docs');
+1 -3
View File
File diff suppressed because one or more lines are too long
+1 -3
View File
File diff suppressed because one or more lines are too long
+1 -3
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -3
View File
File diff suppressed because one or more lines are too long