Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

generate CSS banners via Gruntfile; fixes #10101 #10565

Merged
merged 2 commits into from
Sep 11, 2013
Merged

generate CSS banners via Gruntfile; fixes #10101 #10565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f3a87a
fix punctuation in author field of package.json
cvrebert Sep 11, 2013
2b5d7d2
generate CSS banners via Gruntfile; fixes #10101
cvrebert Sep 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = function(grunt) {

// Metadata.
pkg: grunt.file.readJSON('package.json'),
banner: '/**\n' +
banner: '/*!\n' +
'* Bootstrap v<%= pkg.version %> by @fat and @mdo\n' +
'* Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
'* Licensed under <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
Expand Down Expand Up @@ -73,7 +73,8 @@ module.exports = function(grunt) {

recess: {
options: {
compile: true
compile: true,
banner: '<%= banner %>'
},
bootstrap: {
src: ['less/bootstrap.less'],
Expand Down
7 changes: 7 additions & 0 deletions dist/css/bootstrap-theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*!
* Bootstrap v3.0.0 by @fat and @mdo
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
.btn-default,
.btn-primary,
.btn-success,
Expand Down
7 changes: 7 additions & 0 deletions dist/css/bootstrap-theme.min.css
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 6 additions & 9 deletions dist/css/bootstrap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
/*!
* Bootstrap v3.0.0
*
* Copyright 2013 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/

* Bootstrap v3.0.0 by @fat and @mdo
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
/*! normalize.css v2.1.0 | MIT License | git.io/normalize */

article,
Expand Down
15 changes: 7 additions & 8 deletions dist/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/js/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
/*!
* Bootstrap v3.0.0 by @fat and @mdo
* Copyright 2013 Twitter Inc.
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
Expand Down
4 changes: 2 additions & 2 deletions dist/js/bootstrap.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions less/bootstrap.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
/*!
* Bootstrap v3.0.0
*
* Copyright 2013 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/

// Core variables and mixins
@import "variables.less";
@import "mixins.less";
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, "version": "3.0.0"
, "keywords": ["bootstrap", "css"]
, "homepage": "http://twbs.github.com/bootstrap/"
, "author": "Twitter Inc."
, "author": "Twitter, Inc."
, "scripts": { "test": "grunt test" }
, "repository": {
"type": "git"
Expand Down