mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
Merge pull request #13012 from twbs/banner
This commit is contained in:
commit
1902f0ab50
46
Gruntfile.js
46
Gruntfile.js
@ -245,13 +245,13 @@ module.exports = function (grunt) {
|
||||
},
|
||||
|
||||
cssmin: {
|
||||
compress: {
|
||||
options: {
|
||||
keepSpecialComments: '*',
|
||||
noAdvanced: true, // turn advanced optimizations off until the issue is fixed in clean-css
|
||||
report: 'min',
|
||||
compatibility: 'ie8'
|
||||
},
|
||||
options: {
|
||||
keepSpecialComments: '*',
|
||||
noAdvanced: true, // turn advanced optimizations off until the issue is fixed in clean-css
|
||||
report: 'min',
|
||||
compatibility: 'ie8'
|
||||
},
|
||||
docs: {
|
||||
src: [
|
||||
'docs/assets/css/src/docs.css',
|
||||
'docs/assets/css/src/pygments-manni.css'
|
||||
@ -261,21 +261,12 @@ module.exports = function (grunt) {
|
||||
},
|
||||
|
||||
usebanner: {
|
||||
dist: {
|
||||
options: {
|
||||
position: 'top',
|
||||
banner: '<%= banner %>'
|
||||
},
|
||||
files: {
|
||||
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'
|
||||
]
|
||||
}
|
||||
options: {
|
||||
position: 'top',
|
||||
banner: '<%= banner %>'
|
||||
},
|
||||
files: {
|
||||
src: 'dist/css/*.css'
|
||||
}
|
||||
},
|
||||
|
||||
@ -284,11 +275,10 @@ module.exports = function (grunt) {
|
||||
config: 'less/.csscomb.json'
|
||||
},
|
||||
dist: {
|
||||
files: {
|
||||
'dist/css/<%= pkg.name %>.css': 'dist/css/<%= pkg.name %>.css',
|
||||
'dist/css/<%= pkg.name %>-rtl.css': 'dist/css/<%= pkg.name %>-rtl.css',
|
||||
'dist/css/<%= pkg.name %>-theme.css': 'dist/css/<%= pkg.name %>-theme.css'
|
||||
}
|
||||
expand: true,
|
||||
cwd: 'dist/css/',
|
||||
src: ['*.css', '!*.min.css'],
|
||||
dest: 'dist/css/'
|
||||
},
|
||||
examples: {
|
||||
expand: true,
|
||||
@ -447,7 +437,7 @@ module.exports = function (grunt) {
|
||||
|
||||
// CSS distribution task.
|
||||
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.
|
||||
grunt.registerTask('dist-docs', 'copy:docs');
|
||||
|
4
dist/css/bootstrap-rtl.min.css
vendored
4
dist/css/bootstrap-rtl.min.css
vendored
File diff suppressed because one or more lines are too long
4
dist/css/bootstrap-theme.min.css
vendored
4
dist/css/bootstrap-theme.min.css
vendored
File diff suppressed because one or more lines are too long
4
dist/css/bootstrap.min.css
vendored
4
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
2
docs/assets/js/customize.min.js
vendored
2
docs/assets/js/customize.min.js
vendored
File diff suppressed because one or more lines are too long
4
docs/dist/css/bootstrap-rtl.min.css
vendored
4
docs/dist/css/bootstrap-rtl.min.css
vendored
File diff suppressed because one or more lines are too long
4
docs/dist/css/bootstrap-theme.min.css
vendored
4
docs/dist/css/bootstrap-theme.min.css
vendored
File diff suppressed because one or more lines are too long
4
docs/dist/css/bootstrap.min.css
vendored
4
docs/dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user