diff --git a/Gruntfile.js b/Gruntfile.js index cfefae2cdd..6b861113e4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -9,9 +9,11 @@ module.exports = function(grunt) { // Metadata. pkg: grunt.file.readJSON('package.json'), banner: '/**\n' + - '* <%= pkg.name %>.js v<%= pkg.version %> by @fat and @mdo\n' + + '* Bootstrap v<%= pkg.version %> by @fat and @mdo\n' + '* Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' + - '* <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' + + '* Licensed under <%= _.pluck(pkg.licenses, "url").join(", ") %>.\n' + + '*\n' + + '* Designed and built with all the love in the world by @mdo and @fat.\n' + '*/\n', jqueryCheck: 'if (!jQuery) { throw new Error(\"Bootstrap requires jQuery\") }\n\n', diff --git a/README.md b/README.md index 03f8f3362b..6e3f0f2ba0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [Bootstrap](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap) +# [Bootstrap](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap) [![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.png)](https://david-dm.org/twbs/bootstrap#info=devDependencies) Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat). @@ -65,13 +65,13 @@ When completed, you'll be able to run the various Grunt commands provided from t ### Available Grunt commands #### Build - `grunt` -Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Requires [recess](https://github.com/twitter/recess) and [uglify-js](https://github.com/mishoo/UglifyJS).** +Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [recess] and [UglifyJS].** #### Only compile CSS and JavaScript - `grunt dist` -`grunt dist` creates the `/dist` directory with compiled files. **Requires [recess](https://github.com/twitter/recess) and [uglify-js](https://github.com/mishoo/UglifyJS).** +`grunt dist` creates the `/dist` directory with compiled files. **Uses [recess] and [UglifyJS].** #### Tests - `grunt test` -Runs jshint and qunit tests headlessly in [phantomjs](https://github.com/ariya/phantomjs/) (used for CI). **Requires [phantomjs](https://github.com/ariya/phantomjs/).** +Runs [JSHint](http://jshint.com) and [QUnit](http://qunitjs.com/) tests headlessly in [PhantomJS](http://phantomjs.org/) (used for CI). #### Watch - `grunt watch` This is a convenience method for watching just Less files and automatically building them whenever you save. @@ -139,3 +139,7 @@ For more information on SemVer, please visit [http://semver.org/](http://semver. ## Copyright and license Copyright 2013 Twitter, Inc under [the Apache 2.0 license](LICENSE). + + [recess]: http://twitter.github.io/recess/ "recess" + [uglifyjs]: http://lisperator.net/uglifyjs/ "UglifyJS" + diff --git a/_config.yml b/_config.yml index 332f252fd7..b93496ae09 100644 --- a/_config.yml +++ b/_config.yml @@ -11,6 +11,7 @@ exclude: [".editorconfig", ".gitignore", ".ruby-version", "bower.json", port: 9001 # Custom vars +current_version: 3.0.0 repo: https://github.com/twbs/bootstrap download: https://github.com/twbs/bootstrap/archive/v3.0.0.zip download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.0/bootstrap-3.0.0-dist.zip diff --git a/_includes/nav-css.html b/_includes/nav-css.html index 853b47331b..4d21a4f9fb 100644 --- a/_includes/nav-css.html +++ b/_includes/nav-css.html @@ -76,6 +76,13 @@
  • Helper classes +
  • Responsive utilities diff --git a/_layouts/default.html b/_layouts/default.html index 00b6175fba..3f1276e4e6 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -58,6 +58,8 @@

    Designed and built with all the love in the world by @mdo and @fat.

    Code licensed under Apache License v2.0, documentation under CC BY 3.0.

    -
    +