Skip to content

Commit

Permalink
Merge pull request twbs#13012 from twbs/banner
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR committed Mar 11, 2014
2 parents 57f0932 + b39a8c7 commit 1902f0a
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 47 deletions.
46 changes: 18 additions & 28 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
}
},

Expand All @@ -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,
Expand Down Expand Up @@ -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');
Expand Down
4 changes: 1 addition & 3 deletions dist/css/bootstrap-rtl.min.css

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions dist/css/bootstrap-theme.min.css

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions dist/css/bootstrap.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/assets/js/customize.min.js

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions docs/dist/css/bootstrap-rtl.min.css

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions docs/dist/css/bootstrap-theme.min.css

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions docs/dist/css/bootstrap.min.css

Large diffs are not rendered by default.

0 comments on commit 1902f0a

Please sign in to comment.