0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00

Merge pull request #11989 from ZDroid/banner

Improve banner
This commit is contained in:
Mark Otto 2013-12-23 12:42:41 -08:00
commit 00850e247c
5 changed files with 4 additions and 8 deletions

View File

@ -18,8 +18,8 @@ module.exports = function (grunt) {
banner: '/*!\n' +
' * Bootstrap v<%= pkg.version %> (<%= pkg.homepage %>)\n' +
' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
' * Licensed under MIT (<%= _.pluck(pkg.licenses, "url").join(", ") %>)\n' +
' */\n\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',
// Task configuration.
@ -69,7 +69,7 @@ module.exports = function (grunt) {
concat: {
options: {
banner: '<%= banner %><%= jqueryCheck %>',
banner: '<%= banner %>\n<%= jqueryCheck %>',
stripBanners: false
},
bootstrap: {
@ -93,7 +93,7 @@ module.exports = function (grunt) {
uglify: {
options: {
banner: '<%= banner %>',
banner: '<%= banner %>\n',
report: 'min'
},
bootstrap: {

View File

@ -4,7 +4,6 @@
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
.btn-default,
.btn-primary,
.btn-success,

File diff suppressed because one or more lines are too long

View File

@ -4,7 +4,6 @@
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
article,
aside,

File diff suppressed because one or more lines are too long